From 2559cf8e2b38a1cc684fcd117e98a081078f8875 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Wed, 14 Feb 2024 19:43:49 -0300 Subject: [PATCH] chore(ci) use unique names for release artifacts See: https://github.com/Kong/ngx_wasm_module/pull/506 See: https://github.com/actions/upload-artifact?tab=readme-ov-file#breaking-changeses@v4 See: https://github.com/actions/download-artifact?tab=readme-ov-file#breaking-changes@v4 Co-Authored-By: Caio Ramos Casimiro --- .github/workflows/job-clang-analyzer.yml | 2 +- .github/workflows/job-unit-tests.yml | 2 +- .github/workflows/job-valgrind-tests.yml | 2 +- .github/workflows/release.yml | 34 ++++++++++++------------ 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/job-clang-analyzer.yml b/.github/workflows/job-clang-analyzer.yml index 08d77fa64..3df52c075 100644 --- a/.github/workflows/job-clang-analyzer.yml +++ b/.github/workflows/job-clang-analyzer.yml @@ -69,5 +69,5 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ failure() && !env.ACT }} with: - name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }} + name: ${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.ngx != '' && format('nginx-{0}', inputs.ngx) || format('openresty-{0}', inputs.openresty) }}-${{ inputs.runtime }}-${{ inputs.ssl }}-${{ inputs.hup }}-${{ inputs.debug }} path: work/scans/* diff --git a/.github/workflows/job-unit-tests.yml b/.github/workflows/job-unit-tests.yml index 20aa42d49..c33c80e4a 100644 --- a/.github/workflows/job-unit-tests.yml +++ b/.github/workflows/job-unit-tests.yml @@ -161,7 +161,7 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ failure() && !env.ACT }} with: - name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.runtime }} + name: ${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.ngx != '' && format('nginx-{0}', inputs.ngx) || format('openresty-{0}', inputs.openresty) }}-${{ inputs.runtime }}-${{ inputs.module_type == 'dynamic' && 'dynamic' || 'static'}}-${{ inputs.ssl }}-${{ inputs.hup }}-${{ inputs.debug }} path: | work/buildroot/ t/servroot* diff --git a/.github/workflows/job-valgrind-tests.yml b/.github/workflows/job-valgrind-tests.yml index 231efc1d0..928ef37a0 100644 --- a/.github/workflows/job-valgrind-tests.yml +++ b/.github/workflows/job-valgrind-tests.yml @@ -143,7 +143,7 @@ jobs: - uses: actions/upload-artifact@v4 if: ${{ failure() && !env.ACT }} with: - name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.runtime }} + name: ${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }}-${{ inputs.ngx != '' && format('nginx-{0}', inputs.ngx) || format('openresty-{0}', inputs.openresty) }}-${{ inputs.runtime }}-${{ inputs.hup }} path: | work/buildroot/ t/servroot* diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4bee5dc47..092243caf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -107,7 +107,7 @@ jobs: - name: Upload archive uses: actions/upload-artifact@v4 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} @@ -180,12 +180,12 @@ jobs: env: GITHUB_OAUTH_TOKEN: ${{ secrets.GH_BOT_TOKEN }} - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 if: failure() with: name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }} @@ -214,7 +214,7 @@ jobs: - name: Upload binary uses: actions/upload-artifact@v4 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - uses: actions/upload-artifact@v4 @@ -246,7 +246,7 @@ jobs: - name: Upload binary uses: actions/upload-artifact@v4 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - uses: actions/upload-artifact@v4 @@ -286,7 +286,7 @@ jobs: - name: Upload binary uses: actions/upload-artifact@v4 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - uses: actions/upload-artifact@v4 @@ -316,12 +316,12 @@ jobs: env: GITHUB_OAUTH_TOKEN: ${{ secrets.GH_BOT_TOKEN }} - name: Upload binary - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - - uses: actions/upload-artifact@v4 + - uses: actions/upload-artifact@v3 if: failure() with: name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }} @@ -351,7 +351,7 @@ jobs: - name: Upload binary uses: actions/upload-artifact@v4 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - uses: actions/upload-artifact@v4 @@ -383,7 +383,7 @@ jobs: - name: Upload binary uses: actions/upload-artifact@v4 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - uses: actions/upload-artifact@v3 @@ -412,12 +412,12 @@ jobs: env: GITHUB_OAUTH_TOKEN: ${{ secrets.GH_BOT_TOKEN }} - name: Upload binary - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: release-artifacts + name: release-artifacts-${{ github.job }} path: dist retention-days: ${{ env.RETENTION_DAYS }} - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 if: failure() with: name: ${{ github.workflow }}-${{ github.job }}-sha-${{ github.sha }}-run-${{ github.run_number }} @@ -430,9 +430,9 @@ jobs: timeout-minutes: ${{ fromJSON(vars.GHA_DEFAULT_TIMEOUT) }} steps: - name: Retrieve sibling release artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: release-artifacts + pattern: release-artifacts-* - name: Drop Wasmer binaries run: find . -name '*wasmer*' | xargs rm -f # Channel: nightly