diff --git a/.circleci/config.yml b/.circleci/config.yml index 2ea6231d..5b019cba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -139,8 +139,10 @@ jobs: - store_artifacts: path: ~/Cider/dist/artifacts - run: - name: Update Version Number of App - command: sudo chmod +x resources/version.sh && ./resources/version.sh || true + name: Run Version Script + command: | + sudo chmod +x resources/version.sh && ./resources/version.sh || true + echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV - run: name: Publish Release command: | diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index b8901fb5..688ee949 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -34,11 +34,12 @@ jobs: with: fetch-depth: 0 - - name: Change Version + - name: Run Version Script env: GH_REQUEST_TOKEN: ${{ secrets.RELEASE_TOKEN }} run: | sudo chmod +x resources/version.sh && ./resources/version.sh || true + echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV - name: Sign in to EVS run: | @@ -123,4 +124,4 @@ jobs: repo_name: ciderapp/cider-releases repo_token: ${{ secrets.RELEASE_TOKEN }} file: dist/Cider-${{ env.APP_VERSION }}-universal.pkg - tag: v${{ env.APP_VERSION }} \ No newline at end of file + tag: v${{ env.APP_VERSION }} diff --git a/resources/version.sh b/resources/version.sh index 81bcaa0c..783cb846 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -27,10 +27,3 @@ if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMIT_SINCE_ else echo $CURRENT_VERSION fi - -# Add the version to the environment for CI usage -if [[ $GITHUB_REF_NAME != "" ]]; then - echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$GITHUB_ENV -else - echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV -fi