diff options
| -rw-r--r-- | .github/workflows/ci.yml | 41 | ||||
| -rw-r--r-- | .github/workflows/oniguruma.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/scanbuild.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/valgrind.yml | 2 |
4 files changed, 26 insertions, 23 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e46d0489..f65d0e1c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -105,7 +105,7 @@ jobs: git diff --exit-code - name: Upload Test Logs if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-logs-${{ env.SUFFIX }} retention-days: 7 @@ -113,9 +113,9 @@ jobs: test-suite.log tests/*.log - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: jq-linux + name: jq-${{ env.SUFFIX }} path: jq-${{ env.SUFFIX }} if-no-files-found: error retention-days: 7 @@ -172,7 +172,7 @@ jobs: git diff --exit-code - name: Upload Test Logs if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-logs-${{ env.SUFFIX }} retention-days: 7 @@ -180,9 +180,9 @@ jobs: test-suite.log tests/*.log - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: jq-macos + name: jq-${{ env.SUFFIX }} path: jq-${{ env.SUFFIX }} if-no-files-found: error retention-days: 7 @@ -246,7 +246,7 @@ jobs: git diff --exit-code - name: Upload Test Logs if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-logs-${{ env.SUFFIX }} retention-days: 7 @@ -254,9 +254,9 @@ jobs: test-suite.log tests/*.log - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: jq-windows + name: jq-${{ env.SUFFIX }} path: jq-${{ env.SUFFIX }}.exe if-no-files-found: error retention-days: 7 @@ -283,7 +283,7 @@ jobs: make dist dist-zip git diff --exit-code - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: jq-dist if-no-files-found: error @@ -301,9 +301,10 @@ jobs: - name: Clone repository uses: actions/checkout@v4 - name: Download executables - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: - name: jq-linux + pattern: jq-linux-* + merge-multiple: true - name: Move executables run: | mkdir -p linux/{386,amd64,arm64,mips64le,ppc64le,riscv64,s390x} @@ -364,18 +365,20 @@ jobs: - name: Clone repository uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 + with: + merge-multiple: true - name: Upload release env: TAG_NAME: ${{ github.ref_name }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - cp jq-linux/{jq-linux-amd64,jq-linux64} - cp jq-macos/{jq-macos-amd64,jq-osx-amd64} - cp jq-windows/{jq-windows-amd64.exe,jq-win64.exe} - sha256sum jq-*/jq-* | sed 's| .*/| |' > sha256sum.txt + cp jq-linux-amd64 jq-linux64 + cp jq-macos-amd64 jq-osx-amd64 + cp jq-windows-amd64.exe jq-win64.exe + sha256sum jq-* > sha256sum.txt gh release create "$TAG_NAME" --draft --title "jq ${TAG_NAME#jq-}" --generate-notes - gh release upload "$TAG_NAME" --clobber jq-*/jq-* sha256sum.txt + gh release upload "$TAG_NAME" --clobber jq-* sha256sum.txt - name: Import GPG key uses: crazy-max/ghaction-import-gpg@v6 with: @@ -389,7 +392,7 @@ jobs: sig_dir="sig/v${TAG_NAME#jq-}" mkdir -p "$sig_dir" mv sha256sum.txt "$sig_dir" - for file in jq-*/jq-*; do + for file in jq-*; do gpg --detach-sign --armor --batch --output "${sig_dir}/${file#*/}.asc" "$file" done git add sig diff --git a/.github/workflows/oniguruma.yml b/.github/workflows/oniguruma.yml index d4a7be37..ebe471de 100644 --- a/.github/workflows/oniguruma.yml +++ b/.github/workflows/oniguruma.yml @@ -32,7 +32,7 @@ jobs: git diff --exit-code - name: Upload Test Logs if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-logs-oniguruma-installed retention-days: 7 @@ -64,7 +64,7 @@ jobs: git diff --exit-code - name: Upload Test Logs if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-logs-oniguruma-disabled retention-days: 7 diff --git a/.github/workflows/scanbuild.yml b/.github/workflows/scanbuild.yml index f22b0c1a..135842fb 100644 --- a/.github/workflows/scanbuild.yml +++ b/.github/workflows/scanbuild.yml @@ -69,7 +69,7 @@ jobs: cat test-suite.log cat tests/*.log - name: Upload Logs - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Scan-Build Reports path: '/tmp/scan-build*/' diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml index 76c3c3e8..2bd329f8 100644 --- a/.github/workflows/valgrind.yml +++ b/.github/workflows/valgrind.yml @@ -32,7 +32,7 @@ jobs: git diff --exit-code - name: Upload Test Logs if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-logs-valgrind-linux retention-days: 7 |