Commit 6529e20

authored

Merge pull request #803 from per1234/fix-release-workflows

Fix collision between macOS workflow artifacts in release workflows

2 parents 762375c + e2ee58f commit 6529e20Copy full SHA for 6529e20

File tree

+16

-10

lines changed

+16

-10

lines changed

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,11 @@ jobs:`
`81`	`81`	`strategy:`
`82`	`82`	`matrix:`
`83`	`83`	`build:`
`84`		`- - folder-suffix: darwin_amd64`
	`84`	`+ - artifact-suffix: macOS_64bit`
	`85`	`+ folder-suffix: darwin_amd64`
`85`	`86`	`package-suffix: "macOS_64bit.tar.gz"`
`86`		`- - folder-suffix: darwin_arm64`
	`87`	`+ - artifact-suffix: macOS_ARM64`
	`88`	`+ folder-suffix: darwin_arm64`
`87`	`89`	`package-suffix: "macOS_ARM64.tar.gz"`
`88`	`90`
`89`	`91`	`steps:`
`@@ -172,11 +174,12 @@ jobs:`
`172`	`174`	`-C ../../ LICENSE.txt`
`173`	`175`	`echo "PACKAGE_FILENAME=$PACKAGE_FILENAME" >> $GITHUB_ENV`
`174`	`176`
`175`		`- - name: Upload artifact`
	`177`	`+ - name: Replace artifact with notarized build`
`176`	`178`	`uses: actions/upload-artifact@v4`
`177`	`179`	`with:`
`178`	`180`	`if-no-files-found: error`
`179`		`- name: ${{ env.ARTIFACT_PREFIX }}notarized-${{ matrix.build.folder-suffix }}`
	`181`	`+ name: ${{ env.ARTIFACT_PREFIX }}${{ matrix.build.artifact-suffix }}`
	`182`	`+ overwrite: true`
`180`	`183`	`path: ${{ env.DIST_DIR }}/${{ env.PACKAGE_FILENAME }}`
`181`	`184`
`182`	`185`	`publish-nightly:`
`@@ -193,7 +196,7 @@ jobs:`
`193`	`196`	`path: ${{ env.DIST_DIR }}`
`194`	`197`
`195`	`198`	`- name: Create checksum file`
`196`		`- working-directory: ${{ env.DIST_DIR}}`
	`199`	`+ working-directory: ${{ env.DIST_DIR}}`
`197`	`200`	`run: \|`
`198`	`201`	`TAG="nightly-$(date -u +"%Y%m%d")"`
`199`	`202`	`sha256sum ${{ env.PROJECT_NAME }}_${TAG}* > ${TAG}-checksums.txt`

Lines changed: 8 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,11 @@ jobs:`
`88`	`88`	`strategy:`
`89`	`89`	`matrix:`
`90`	`90`	`build:`
`91`		`- - folder-suffix: darwin_amd64`
	`91`	`+ - artifact-suffix: macOS_64bit`
	`92`	`+ folder-suffix: darwin_amd64`
`92`	`93`	`package-suffix: "macOS_64bit.tar.gz"`
`93`		`- - folder-suffix: darwin_arm64`
	`94`	`+ - artifact-suffix: macOS_ARM64`
	`95`	`+ folder-suffix: darwin_arm64`
`94`	`96`	`package-suffix: "macOS_ARM64.tar.gz"`
`95`	`97`
`96`	`98`	`steps:`
`@@ -178,11 +180,12 @@ jobs:`
`178`	`180`	`-C "${{ env.BUILD_FOLDER }}/" "${{ env.PROJECT_NAME }}" \`
`179`	`181`	`-C ../../ LICENSE.txt`
`180`	`182`
`181`		`- - name: Upload artifact`
	`183`	`+ - name: Replace artifact with notarized build`
`182`	`184`	`uses: actions/upload-artifact@v4`
`183`	`185`	`with:`
`184`	`186`	`if-no-files-found: error`
`185`		`- name: ${{ env.ARTIFACT_PREFIX }}notarized-${{ matrix.build.folder-suffix }}`
	`187`	`+ name: ${{ env.ARTIFACT_PREFIX }}${{ matrix.build.artifact-suffix }}`
	`188`	`+ overwrite: true`
`186`	`189`	`path: ${{ env.DIST_DIR }}/${{ env.PACKAGE_FILENAME }}`
`187`	`190`
`188`	`191`	`create-release:`
`@@ -200,7 +203,7 @@ jobs:`
`200`	`203`	`path: ${{ env.DIST_DIR }}`
`201`	`204`
`202`	`205`	`- name: Create checksum file`
`203`		`- working-directory: ${{ env.DIST_DIR}}`
	`206`	`+ working-directory: ${{ env.DIST_DIR}}`
`204`	`207`	`run: \|`
`205`	`208`	`TAG="${GITHUB_REF/refs\/tags\//}"`
`206`	`209`	`sha256sum ${{ env.PROJECT_NAME }}_${TAG}* > ${TAG}-checksums.txt`

Comments

(0)