diff options
| author | rejbasket <39080670+rejbasket@users.noreply.github.com> | 2025-05-09 09:55:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-09 09:55:16 +0200 |
| commit | 3121d5365b9a13570531288f6fe2cd4b3f29ec1f (patch) | |
| tree | 87c2428855efb93655c5e55f5132e974dc50b76d | |
| parent | 3b9362d270cfb34638f1c7765f5bc513e2624a45 (diff) | |
macos notary fix to allow beta releases (#3710)
build.yml fixed issue with if conditon not seeing tags properly
| -rwxr-xr-x | .github/workflows/build.yml | 14 | ||||
| -rw-r--r-- | bin/build-distribution-archives | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f86b85cf..4ef7c932 100755 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: - master - main tags: - - "v*" + - "v*.*.*" jobs: linux64: runs-on: ubuntu-22.04 @@ -225,12 +225,12 @@ jobs: env: BUILD: windows - name: Set siging policy to release - if: ${{ startsWith(github.ref, 'refs/tags/v*') }} + if: startsWith(github.event.ref, 'refs/tags/v') shell: bash run: | echo release_policy="release-signing" >> $GITHUB_ENV - name: upload-unsigned-exe - if: ${{ startsWith(github.ref, 'refs/tags/v*') }} + if: startsWith(github.event.ref, 'refs/tags/v') id: upload-unsigned-exe uses: actions/upload-artifact@v4 with: @@ -238,7 +238,7 @@ jobs: path: | dist/inkstitch/bin/inkstitch.exe - name: Sign-exe - if: ${{ startsWith(github.ref, 'refs/tags/v*') }} + if: startsWith(github.event.ref, 'refs/tags/v') id: Sign-exe uses: signpath/github-action-submit-signing-request@v1.1 with: @@ -250,7 +250,7 @@ jobs: wait-for-completion: true output-artifact-directory: 'signed-artifacts' - name: Copy signed exe to dist - if: ${{ startsWith(github.ref, 'refs/tags/v*') }} + if: startsWith(github.event.ref, 'refs/tags/v') shell: bash run: | mv -f signed-artifacts/inkstitch.exe dist/inkstitch/bin/inkstitch.exe @@ -260,14 +260,14 @@ jobs: env: BUILD: windows - name: upload-unsigned-installer - if: ${{ startsWith(github.ref, 'refs/tags/v*') }} + if: startsWith(github.event.ref, 'refs/tags/v') id: upload-unsigned-installer uses: actions/upload-artifact@v4 with: name: inkstitch-windows64-installer path: artifacts - name: Sign-installer - if: ${{ startsWith(github.ref, 'refs/tags/v*') }} + if: startsWith(github.event.ref, 'refs/tags/v') id: Sign-installer uses: signpath/github-action-submit-signing-request@v1.1 with: diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives index c194a81b..72da7c7b 100644 --- a/bin/build-distribution-archives +++ b/bin/build-distribution-archives @@ -50,7 +50,7 @@ if [ "$BUILD" = "osx" ]; then --scripts installer_scripts/scripts \ --install-location ${PKG_INSTALL_PATH}inkstitch.app \ artifacts/inkstitch-${VERSION}-${OS}-${ARCH}.pkg - if [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9.]+$ || $NOTARIZE_DEVELOPMENT_BUILDS == true ]]; then + if [[ "${GITHUB_REF}" =~ ^refs/tags/v[0-9.]+ || $NOTARIZE_DEVELOPMENT_BUILDS == true ]]; then echo "Notary starting" echo "Adding keychain item for notarytool" xcrun notarytool store-credentials "inkstitch-profile" \ |