diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 3c7bf4a4..1c0a9161 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -59,7 +59,7 @@ jobs: # Build the DMG - - name: Build + - name: Build the DMG env: CSC_LINK: ${{ secrets.CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} @@ -82,7 +82,7 @@ jobs: p12-password: ${{ secrets.CSC_KEY_PASSWORD }} # Build to PKG - - name: Create PKG manually + - name: Build the PKG env: CSC_LINK: ${{ secrets.CSC_LINK }} CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} diff --git a/resources/version.sh b/resources/version.sh index 4f4f3ac8..c11957f5 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -26,11 +26,10 @@ else echo "Version unchanged, commits since stable is ${COMMITSINCESTABLE}" fi -# Make it a environment variable -if [[ -z "${GITHUB_REF}" ]]; then - echo "APP_VERSION=$(node -p -e 'require("./package.json").version')" >> $GITHUB_ENV +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 + echo "export APP_VERSION=$(node -p -e 'require("./package.json").version')" >>$BASH_ENV fi node -p -e "require('./package.json').version"