Skip to content

Commit 34fd19b

Browse files
authored
Merge pull request #214 from arduino/dependabot/github_actions/actions/upload-artifact-4
build(deps): bump actions/upload-artifact from 3 to 4
2 parents 6d1a26f + 152e510 commit 34fd19b

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

.github/workflows/sync-labels-npm.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ env:
55
# See: https://github.com/actions/setup-node/#readme
66
NODE_VERSION: 16.x
77
CONFIGURATIONS_FOLDER: .github/label-configuration-files
8-
CONFIGURATIONS_ARTIFACT: label-configuration-files
8+
CONFIGURATIONS_ARTIFACT_PREFIX: label-configuration-file-
99

1010
# See: https://docs.github.com/actions/using-workflows/events-that-trigger-workflows
1111
on:
@@ -84,13 +84,13 @@ jobs:
8484
file-url: https://raw.githubusercontent.com/arduino/tooling-project-assets/main/workflow-templates/assets/sync-labels/${{ matrix.filename }}
8585

8686
- name: Pass configuration files to next job via workflow artifact
87-
uses: actions/upload-artifact@v3
87+
uses: actions/upload-artifact@v4
8888
with:
8989
path: |
9090
*.yaml
9191
*.yml
9292
if-no-files-found: error
93-
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
93+
name: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}${{ matrix.filename }}
9494

9595
sync:
9696
needs: download
@@ -124,16 +124,17 @@ jobs:
124124
- name: Checkout repository
125125
uses: actions/checkout@v4
126126

127-
- name: Download configuration files artifact
128-
uses: actions/download-artifact@v3
127+
- name: Download configuration file artifacts
128+
uses: actions/download-artifact@v4
129129
with:
130-
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
130+
merge-multiple: true
131+
pattern: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}*
131132
path: ${{ env.CONFIGURATIONS_FOLDER }}
132133

133-
- name: Remove unneeded artifact
134-
uses: geekyeggo/delete-artifact@v2
134+
- name: Remove unneeded artifacts
135+
uses: geekyeggo/delete-artifact@v5
135136
with:
136-
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
137+
name: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}*
137138

138139
- name: Setup Node.js
139140
uses: actions/setup-node@v4

.github/workflows/test-integration.yml

+11-8
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ jobs:
9292
matrix:
9393
board:
9494
- fqbn: arduino:avr:uno
95+
artifact-name-suffix: arduino-avr-uno
9596
platforms: |
9697
- name: arduino:avr
9798
version: 1.8.3
@@ -100,6 +101,7 @@ jobs:
100101
version: 1.1.7
101102
# Board that requires Boards Manager URL
102103
- fqbn: esp8266:esp8266:huzzah
104+
artifact-name-suffix: esp8266-esp8266-huzzah
103105
platforms: |
104106
- name: esp8266:esp8266
105107
source-url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
@@ -140,18 +142,18 @@ jobs:
140142
[ -d ${{ env.TESTDATA_SKETCHES_PATH }}/BareMinimum/build ]
141143
142144
- name: Set report artifact name
143-
id: report-artifact-name
145+
id: report-artifact-prefix
144146
run: |
145-
echo "report-artifact-name=${{ github.job }}" >> "$GITHUB_OUTPUT"
147+
echo "report-artifact-prefix=${{ github.job }}" >> "$GITHUB_OUTPUT"
146148
147149
- name: Save sketches report as workflow artifact
148-
uses: actions/upload-artifact@v3
150+
uses: actions/upload-artifact@v4
149151
with:
150152
path: sketches-reports
151-
name: ${{ steps.report-artifact-name.outputs.report-artifact-name }}
153+
name: ${{ steps.report-artifact-prefix.outputs.report-artifact-prefix }}-${{ matrix.board.artifact-name-suffix }}
152154

153155
outputs:
154-
report-artifact-name: ${{ steps.report-artifact-name.outputs.report-artifact-name }}
156+
report-artifact-prefix: ${{ steps.report-artifact-prefix.outputs.report-artifact-prefix }}
155157

156158
multiple-steps:
157159
name: multiple-steps (${{ matrix.board.source-type }})
@@ -320,10 +322,11 @@ jobs:
320322
uses: actions/checkout@v4
321323

322324
- name: Download sketches reports artifact
323-
uses: actions/download-artifact@v3
325+
uses: actions/download-artifact@v4
324326
with:
325-
name: ${{ needs.all-inputs.outputs.report-artifact-name }}
327+
merge-multiple: true
326328
path: ${{ env.SKETCHES_REPORTS_PATH }}
329+
pattern: ${{ needs.all-inputs.outputs.report-artifact-prefix }}*
327330

328331
- name: Compare generated sketches report to golden report
329332
run: |
@@ -349,7 +352,7 @@ jobs:
349352
"$reportPath" \
350353
--slurpfile \
351354
golden \
352-
"${{ env.TESTDATA_REPORTS_PATH }}/${{ needs.all-inputs.outputs.report-artifact-name }}/$(basename "$reportPath")" \
355+
"${{ env.TESTDATA_REPORTS_PATH }}/${{ needs.all-inputs.outputs.report-artifact-prefix }}/$(basename "$reportPath")" \
353356
'($generated|.[0].boards) == ($golden|.[0].boards)'
354357
) && (
355358
# Check the commit_hash value

0 commit comments

Comments
 (0)