diff --git a/.github/workflows/sync-labels-npm.yml b/.github/workflows/sync-labels-npm.yml index 832de1b..2e356af 100644 --- a/.github/workflows/sync-labels-npm.yml +++ b/.github/workflows/sync-labels-npm.yml @@ -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: @@ -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 @@ -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 diff --git a/.github/workflows/test-integration.yml b/.github/workflows/test-integration.yml index 4ba6d93..134c8ab 100644 --- a/.github/workflows/test-integration.yml +++ b/.github/workflows/test-integration.yml @@ -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 @@ -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 @@ -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 }}) @@ -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: | @@ -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