Skip to content

Commit d6f6034

Browse files
authored
Merge pull request #525 from pact-foundation/ci/fix_upload_download_v4_actions
Ci/fix upload download v4 actions
2 parents bdddd61 + 4254a4c commit d6f6034

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/build-and-test.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,10 @@ jobs:
9090
if: ${{ matrix.docker != true }}
9191

9292
- name: Upload prebuild for ${{ runner.os }}-${{ runner.arch }}
93-
uses: actions/upload-artifact@v3
93+
uses: actions/upload-artifact@v4
9494
with:
9595
path: prebuilds/*.tar.gz
96+
name: artifact-${{ matrix.docker == true && matrix.alpine == true && 'linux-musl' || matrix.docker == true && matrix.alpine == false && 'linux' || matrix.os }}-${{ matrix.arch }}
9697

9798
- run: GH_PRE_RELEASE_UPLOAD=true ./script/ci/release.sh
9899
if: github.ref == 'refs/heads/master' && env.ACT != true
@@ -222,4 +223,4 @@ jobs:
222223
GITHUB_TOKEN: ${{ github.token }}
223224
DRY_RUN: true
224225

225-
- run: echo "New Release will be v${{ steps.publish.outputs.version }}"
226+
- run: echo "New Release will be v${{ steps.publish.outputs.version }}"

script/ci/unpack-and-test.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")"; pwd)" # Figure out where the
66
. "$SCRIPT_DIR"/../lib/robust-bash.sh
77

88
ls -1
9-
ls -1 artifact
109
mkdir -p prebuilds
11-
mv artifact*/*.tar.gz . || echo "no mac prebuilds"
10+
mv artifact*/*.tar.gz .
1211
ls *.gz |xargs -n1 tar -xzf
1312
"$SCRIPT_DIR"/../download-plugins.sh
1413
"$SCRIPT_DIR"/build-and-test.sh

0 commit comments

Comments
 (0)