Skip to content

Commit d22057e

Browse files
authored
Merge pull request #465 from eclipse-threadx/master
Port CI fixes to dev branch
2 parents 3128f18 + 12dac1d commit d22057e

File tree

2 files changed

+44
-17
lines changed

2 files changed

+44
-17
lines changed

.github/workflows/regression_template.yml

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
# Steps represent a sequence of tasks that will be executed as part of the job
6464
steps:
6565
- name: Check out the repository
66-
uses: actions/checkout@v4
66+
uses: actions/checkout@v4.2.2
6767
with:
6868
submodules: true
6969

@@ -86,7 +86,7 @@ jobs:
8686
8787
- name: Upload Test Results
8888
if: success() || failure()
89-
uses: actions/[email protected].0
89+
uses: actions/[email protected].2
9090
with:
9191
name: test_reports ${{ inputs.result_affix }}
9292
path: |
@@ -95,7 +95,7 @@ jobs:
9595
${{ inputs.cmake_path }}/build/**/regression/output_files/*.bin
9696
9797
- name: Configure GitHub Pages
98-
uses: actions/configure-pages@v3.0.6
98+
uses: actions/configure-pages@v5.0.0
9999

100100
- name: Generate Code Coverage Results Summary
101101
if: (!inputs.skip_coverage)
@@ -115,7 +115,7 @@ jobs:
115115
116116
- name: Create CheckRun for Code Coverage
117117
if: ((github.event_name == 'push') || (github.event_name == 'workflow_dispatch') || (github.event.pull_request.head.repo.full_name == github.repository)) && (!inputs.skip_coverage)
118-
uses: LouisBrunner/checks-action@v1.6.2
118+
uses: LouisBrunner/checks-action@v2.0.0
119119
with:
120120
token: ${{ secrets.GITHUB_TOKEN }}
121121
name: Code Coverage ${{ inputs.result_affix }}
@@ -126,7 +126,7 @@ jobs:
126126

127127
- name: Add Code Coverage PR Comment
128128
if: ((github.event_name == 'push') || (github.event.pull_request.head.repo.full_name == github.repository)) && (!inputs.skip_coverage)
129-
uses: marocchino/sticky-pull-request-comment@v2
129+
uses: marocchino/sticky-pull-request-comment@v2.9.4
130130
with:
131131
header: Code Coverage ${{ inputs.result_affix }}
132132
path: code-coverage-results.md
@@ -139,17 +139,22 @@ jobs:
139139
sudo mv ${{ inputs.cmake_path }}/coverage_report/${{ inputs.coverage_name }} \
140140
${{ inputs.cmake_path }}/coverage_report/${{ inputs.result_affix }}
141141
fi
142-
142+
143+
- name: Coverage Report name
144+
id: artifact
145+
if: (!inputs.skip_coverage)
146+
run: echo "coverage_report=coverage_report-$(date +%s)" >> $GITHUB_OUTPUT
147+
143148
- name: Upload Code Coverage Artifacts
144-
uses: actions/[email protected].0
149+
uses: actions/[email protected].2
145150
if: (inputs.skip_deploy && !inputs.skip_coverage)
146151
with:
147-
name: coverage_report
148-
path: ${{ inputs.cmake_path }}/coverage_report
149-
retention-days: 1
150-
152+
name: ${{ steps.artifact.outputs.coverage_report }}
153+
path: ${{ inputs.cmake_path }}/coverage_report
154+
retention-days: 1
155+
151156
- name: Upload Code Coverage Pages
152-
uses: actions/upload-pages-artifact@v2.0.0
157+
uses: actions/upload-pages-artifact@v3.0.1
153158
if: (!inputs.skip_deploy && !inputs.skip_coverage)
154159
with:
155160
path: ${{ inputs.cmake_path }}/coverage_report/${{ inputs.coverage_name }}
@@ -166,25 +171,26 @@ jobs:
166171
id-token: write
167172

168173
steps:
169-
- uses: actions/download-artifact@v4.1.7
174+
- uses: actions/download-artifact@v4.3.0
170175
if: ${{ inputs.skip_test }}
171176
with:
172-
name: coverage_report
177+
name: ${{ steps.artifact.outputs.coverage_report }}
178+
path: ${{ inputs.cmake_path }}/coverage_report
173179

174180
- name: Upload Code Coverage Pages
175-
uses: actions/upload-pages-artifact@v2.0.0
181+
uses: actions/upload-pages-artifact@v3.0.1
176182
if: ${{ inputs.skip_test }}
177183
with:
178184
path: .
179185

180186
- name: Delete Duplicate Code Coverage Artifact
181-
uses: geekyeggo/delete-artifact@v2
187+
uses: geekyeggo/delete-artifact@v5.1.0
182188
with:
183189
name: coverage_report
184190

185191
- name: Deploy GitHub Pages site
186192
id: deployment
187-
uses: actions/deploy-pages@v1.2.9
193+
uses: actions/deploy-pages@v4.0.5
188194

189195
- name: Write Code Coverage Report URL
190196
run: >-

.github/workflows/regression_test.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ on:
1212
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1313
jobs:
1414
tx:
15+
permissions:
16+
contents: read
17+
issues: read
18+
checks: write
19+
pull-requests: write
20+
pages: write
21+
id-token: write
1522
uses: ./.github/workflows/regression_template.yml
1623
with:
1724
build_script: ./scripts/build_tx.sh
@@ -20,6 +27,13 @@ jobs:
2027
result_affix: ThreadX
2128
skip_deploy: true
2229
smp:
30+
permissions:
31+
contents: read
32+
issues: read
33+
checks: write
34+
pull-requests: write
35+
pages: write
36+
id-token: write
2337
uses: ./.github/workflows/regression_template.yml
2438
with:
2539
build_script: ./scripts/build_smp.sh
@@ -28,6 +42,13 @@ jobs:
2842
result_affix: SMP
2943
skip_deploy: true
3044
deploy:
45+
permissions:
46+
contents: read
47+
issues: read
48+
checks: write
49+
pull-requests: write
50+
pages: write
51+
id-token: write
3152
needs: [tx, smp]
3253
uses: ./.github/workflows/regression_template.yml
3354
with:

0 commit comments

Comments
 (0)