From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 5 Nov 2025 15:05:32 +0000 (+0100)
Subject: Merge pull request #16376 from jsoref/bump-actions
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba07371fd55ff65570c0b96e3c994d7e168228cb;p=thirdparty%2Fpdns.git

Merge pull request #16376 from jsoref/bump-actions

Bump actions
---

ba07371fd55ff65570c0b96e3c994d7e168228cb
diff --cc .github/workflows/build-and-test-all.yml
index aefd473fbe,2e0dbae766..4390450f49
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@@ -324,9 -319,9 +324,9 @@@ jobs
            for i in $(find . -maxdepth 1 -type f -executable); do cp ${i} /opt/dnsdist/bin/; done
        - name: Store the binaries
          if: ${{ matrix.builder == 'meson' }}
-         uses: actions/upload-artifact@v4 # this takes 30 seconds, maybe we want to tar
+         uses: actions/upload-artifact@v5 # this takes 30 seconds, maybe we want to tar
          with:
 -          name: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}-${{ env.normalized-branch-name }}
 +          name: dnsdist-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ matrix.builder}}${{ matrix.architecture_suffix }}-${{ env.normalized-branch-name }}
            path: /opt/dnsdist
            retention-days: 1
  
diff --cc .github/workflows/build-packages.yml
index 06cd89aed4,ae5a6ec70f..d20532dc7b
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@@ -341,9 -341,9 +341,9 @@@ jobs
            PULP_CI_USERNAME: ${{ secrets.PULP_CI_USERNAME }}
            PULP_CI_PASSWORD: ${{ secrets.PULP_CI_PASSWORD }}
        - name: Download packages
-         uses: actions/download-artifact@v4
+         uses: actions/download-artifact@v6
          with:
 -          pattern: "${{ inputs.product }}-${{ matrix.os }}-*-${{ matrix.architecture }}"
 +          pattern: "${{ inputs.product }}-${{ matrix.os }}-${{ needs.build.outputs.version }}-${{ matrix.architecture }}"
        - name: Normalize package name
          id: normalize-name
          run: |
@@@ -412,9 -411,9 +412,9 @@@
            PULP_CI_USERNAME: ${{ secrets.PULP_CI_USERNAME }}
            PULP_CI_PASSWORD: ${{ secrets.PULP_CI_PASSWORD }}
        - name: Download packages
-         uses: actions/download-artifact@v4
+         uses: actions/download-artifact@v6
          with:
 -          pattern: "${{ inputs.product }}-${{ matrix.os }}-*-${{ matrix.architecture }}"
 +          pattern: "${{ inputs.product }}-${{ matrix.os }}-${{ needs.build.outputs.version }}-${{ matrix.architecture }}"
        - name: Normalize package name
          id: normalize-name
          run: |
@@@ -447,10 -446,9 +447,10 @@@
      needs: [build, provenance-src, provenance-pkgs]
      name: Upload provenance files
      continue-on-error: true
 +    if: ${{ needs.prepare.outputs.publish-packages == 'yes' }}
      runs-on: ubuntu-24.04
      steps:
-       - uses: actions/checkout@v4
+       - uses: actions/checkout@v5
          with:
            fetch-depth: 1
            submodules: recursive
@@@ -465,9 -463,9 +465,9 @@@
            PULP_CI_USERNAME: ${{ secrets.PULP_CI_USERNAME }}
            PULP_CI_PASSWORD: ${{ secrets.PULP_CI_PASSWORD }}
        - name: Download provenance files
-         uses: actions/download-artifact@v4
+         uses: actions/download-artifact@v6
          with:
 -          pattern: "${{ inputs.product }}-*.intoto.jsonl"
 +          pattern: "${{ inputs.product }}-${{ needs.build.outputs.version }}-*.intoto.jsonl"
        - name: Normalize package name
          id: normalize-name
          run: |