Skip to content

Commit

Permalink
Merge pull request #214 from arduino/dependabot/github_actions/action…
Browse files Browse the repository at this point in the history
…s/upload-artifact-4

build(deps): bump actions/upload-artifact from 3 to 4
  • Loading branch information
per1234 authored Oct 19, 2024
2 parents 6d1a26f + 152e510 commit 34fd19b
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 17 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/sync-labels-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ env:
# See: https://github.com/actions/setup-node/#readme
NODE_VERSION: 16.x
CONFIGURATIONS_FOLDER: .github/label-configuration-files
CONFIGURATIONS_ARTIFACT: label-configuration-files
CONFIGURATIONS_ARTIFACT_PREFIX: label-configuration-file-

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

- name: Pass configuration files to next job via workflow artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: |
*.yaml
*.yml
if-no-files-found: error
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
name: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}${{ matrix.filename }}

sync:
needs: download
Expand Down Expand Up @@ -124,16 +124,17 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Download configuration files artifact
uses: actions/download-artifact@v3
- name: Download configuration file artifacts
uses: actions/download-artifact@v4
with:
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
merge-multiple: true
pattern: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}*
path: ${{ env.CONFIGURATIONS_FOLDER }}

- name: Remove unneeded artifact
uses: geekyeggo/delete-artifact@v2
- name: Remove unneeded artifacts
uses: geekyeggo/delete-artifact@v5
with:
name: ${{ env.CONFIGURATIONS_ARTIFACT }}
name: ${{ env.CONFIGURATIONS_ARTIFACT_PREFIX }}*

- name: Setup Node.js
uses: actions/setup-node@v4
Expand Down
19 changes: 11 additions & 8 deletions .github/workflows/test-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ jobs:
matrix:
board:
- fqbn: arduino:avr:uno
artifact-name-suffix: arduino-avr-uno
platforms: |
- name: arduino:avr
version: 1.8.3
Expand All @@ -100,6 +101,7 @@ jobs:
version: 1.1.7
# Board that requires Boards Manager URL
- fqbn: esp8266:esp8266:huzzah
artifact-name-suffix: esp8266-esp8266-huzzah
platforms: |
- name: esp8266:esp8266
source-url: https://arduino.esp8266.com/stable/package_esp8266com_index.json
Expand Down Expand Up @@ -140,18 +142,18 @@ jobs:
[ -d ${{ env.TESTDATA_SKETCHES_PATH }}/BareMinimum/build ]
- name: Set report artifact name
id: report-artifact-name
id: report-artifact-prefix
run: |
echo "report-artifact-name=${{ github.job }}" >> "$GITHUB_OUTPUT"
echo "report-artifact-prefix=${{ github.job }}" >> "$GITHUB_OUTPUT"
- name: Save sketches report as workflow artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: sketches-reports
name: ${{ steps.report-artifact-name.outputs.report-artifact-name }}
name: ${{ steps.report-artifact-prefix.outputs.report-artifact-prefix }}-${{ matrix.board.artifact-name-suffix }}

outputs:
report-artifact-name: ${{ steps.report-artifact-name.outputs.report-artifact-name }}
report-artifact-prefix: ${{ steps.report-artifact-prefix.outputs.report-artifact-prefix }}

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

- name: Download sketches reports artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ needs.all-inputs.outputs.report-artifact-name }}
merge-multiple: true
path: ${{ env.SKETCHES_REPORTS_PATH }}
pattern: ${{ needs.all-inputs.outputs.report-artifact-prefix }}*

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

0 comments on commit 34fd19b

Please sign in to comment.