From 61c1ac7d96dc0f94464c6001a5501446cc43cce9 Mon Sep 17 00:00:00 2001 From: Core Date: Mon, 3 Oct 2022 14:12:44 +0100 Subject: [PATCH] pls --- .github/workflows/build-macos.yml | 6 +++--- resources/version.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 8d3cf1b8..76128c53 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -90,7 +90,7 @@ jobs: repo_name: ciderapp/cider-releases repo_token: ${{ secrets.RELEASE_TOKEN }} file: dist/latest-mac.yml - tag: v${{ env.RELEASE_VERSION }} + tag: v${{ env.APP_VERSION }} - name: Import uses: apple-actions/import-codesign-certs@v1 @@ -125,7 +125,7 @@ jobs: repo_name: ciderapp/cider-releases repo_token: ${{ secrets.RELEASE_TOKEN }} file: dist/Cider*.dmg - tag: v${{ env.RELEASE_VERSION }} + tag: v${{ env.APP_VERSION }} - name: Upload Files (PKG) uses: svenstaro/upload-release-action@v2 @@ -133,7 +133,7 @@ jobs: repo_name: ciderapp/cider-releases repo_token: ${{ secrets.RELEASE_TOKEN }} file: dist/Cider*.pkg - tag: v${{ env.RELEASE_VERSION }} + tag: v${{ env.APP_VERSION }} - name: Trigger Bot Sync (main) uses: indiesdev/curl@v1.1 with: diff --git a/resources/version.sh b/resources/version.sh index 4c80dd1a..e8f49c09 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -39,7 +39,7 @@ echo $NEW_VERSION_NUMBERED if [[ $GITHUB_REF_NAME != "" ]]; then echo "APP_VERSION=$NEW_VERSION" >>$GITHUB_ENV echo "RELEASE_VERSION=$NEW_VERSION_NUMBERED" >>$GITHUB_ENV -else +elif [[ $CIRCLE_BRANCH != "" ]]; then echo "export APP_VERSION=$NEW_VERSION" >>$BASH_ENV echo "export RELEASE_VERSION=$NEW_VERSION_NUMBERED" >>$BASH_ENV fi