Merge pull request #525 from pact-foundation/ci/fix_upload_download_v…

…4_actions Ci/fix upload download v4 actions
pact-foundation · Sep 6, 2024 · d6f6034 · d6f6034
2 parents bdddd61 + 4254a4c
commit d6f6034
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -90,9 +90,10 @@ jobs:
         if: ${{ matrix.docker != true }}
 
       - name: Upload prebuild for ${{ runner.os }}-${{ runner.arch }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           path: prebuilds/*.tar.gz
+          name: artifact-${{ matrix.docker == true && matrix.alpine == true && 'linux-musl' || matrix.docker == true && matrix.alpine == false && 'linux' || matrix.os }}-${{ matrix.arch }}
 
       - run: GH_PRE_RELEASE_UPLOAD=true ./script/ci/release.sh
         if: github.ref == 'refs/heads/master' && env.ACT != true
@@ -222,4 +223,4 @@ jobs:
           GITHUB_TOKEN: ${{ github.token }}
           DRY_RUN: true
 
-      - run: echo "New Release will be v${{ steps.publish.outputs.version }}"
+      - run: echo "New Release will be v${{ steps.publish.outputs.version }}"
diff --git a/script/ci/unpack-and-test.sh b/script/ci/unpack-and-test.sh
@@ -6,9 +6,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the
 . "$SCRIPT_DIR"/../lib/robust-bash.sh
 
 ls -1
-ls -1 artifact
 mkdir -p prebuilds
-mv artifact*/*.tar.gz . || echo "no mac prebuilds"
+mv artifact*/*.tar.gz .
 ls *.gz |xargs -n1 tar -xzf
 "$SCRIPT_DIR"/../download-plugins.sh
 "$SCRIPT_DIR"/build-and-test.sh