Skip to content

Commit 06e6a0e

Browse files
authored
Merge pull request #530 from per1234/fix-release-workflow
Fix collision between macOS workflow artifacts in release workflows
2 parents 4e7a852 + 973700b commit 06e6a0e

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

workflow-templates/publish-go-nightly-task.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ jobs:
8282
strategy:
8383
matrix:
8484
build:
85-
- folder-suffix: darwin_amd64
85+
- artifact-suffix: macOS_64bit
86+
folder-suffix: darwin_amd64
8687
package-suffix: "macOS_64bit.tar.gz"
87-
- folder-suffix: darwin_arm64
88+
- artifact-suffix: macOS_ARM64
89+
folder-suffix: darwin_arm64
8890
package-suffix: "macOS_ARM64.tar.gz"
8991

9092
steps:
@@ -173,11 +175,12 @@ jobs:
173175
-C ../../ LICENSE.txt
174176
echo "PACKAGE_FILENAME=$PACKAGE_FILENAME" >> $GITHUB_ENV
175177
176-
- name: Upload artifact
178+
- name: Replace artifact with notarized build
177179
uses: actions/upload-artifact@v4
178180
with:
179181
if-no-files-found: error
180-
name: ${{ env.ARTIFACT_PREFIX }}notarized-${{ matrix.build.folder-suffix }}
182+
name: ${{ env.ARTIFACT_PREFIX }}${{ matrix.build.artifact-suffix }}
183+
overwrite: true
181184
path: ${{ env.DIST_DIR }}/${{ env.PACKAGE_FILENAME }}
182185

183186
publish-nightly:

workflow-templates/release-go-task.yml

+7-4
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,11 @@ jobs:
8989
strategy:
9090
matrix:
9191
build:
92-
- folder-suffix: darwin_amd64
92+
- artifact-suffix: macOS_64bit
93+
folder-suffix: darwin_amd64
9394
package-suffix: "macOS_64bit.tar.gz"
94-
- folder-suffix: darwin_arm64
95+
- artifact-suffix: macOS_ARM64
96+
folder-suffix: darwin_arm64
9597
package-suffix: "macOS_ARM64.tar.gz"
9698

9799
steps:
@@ -179,11 +181,12 @@ jobs:
179181
-C "${{ env.BUILD_FOLDER }}/" "${{ env.PROJECT_NAME }}" \
180182
-C ../../ LICENSE.txt
181183
182-
- name: Upload artifact
184+
- name: Replace artifact with notarized build
183185
uses: actions/upload-artifact@v4
184186
with:
185187
if-no-files-found: error
186-
name: ${{ env.ARTIFACT_PREFIX }}notarized-${{ matrix.build.folder-suffix }}
188+
name: ${{ env.ARTIFACT_PREFIX }}${{ matrix.build.artifact-suffix }}
189+
overwrite: true
187190
path: ${{ env.DIST_DIR }}/${{ env.PACKAGE_FILENAME }}
188191

189192
create-release:

0 commit comments

Comments
 (0)