diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 911cc185..3c90ef96 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -43,7 +43,7 @@ jobs: python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} - name: Setup Environment - run: brew install autoconf automake libtool + run: brew install automake #libtool autoconf - name: Install and Configure Node Modules run: | @@ -96,16 +96,21 @@ jobs: path: | dist/*.dmg dist/*.pkg - latest-mac.yml + dist/latest-mac.yml - name: Upload Artifacts to Latest Release uses: softprops/action-gh-release@v1 + env: + GITHUB_REPOSITORY: ciderapp/cider-releases + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - token: ${{ secrets.RELEASE_TOKEN }} + repository: ciderapp/cider-releases + token: ${{ secrets.GITHUB_TOKEN }} + append_body: false files: | dist/*.dmg dist/*.pkg - latest-mac.yml + dist/latest-mac.yml tag_name: v${{ env.APP_VERSION }} - env: - GITHUB_REPOSITORY: ciderapp/cider-releases \ No newline at end of file + title: Cider Version ${{ env.APP_VERSION }} (${{ env.GITHUB_REF_NAME }}) + body: Full changelog available [here](https://github.com/ciderapp/Cider/compare/stable...main) \ No newline at end of file diff --git a/resources/version.sh b/resources/version.sh index 12928ad5..1129bb95 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -2,7 +2,8 @@ STABLE_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4) SHA_DATE=$(git show -s --format=%ci $STABLE_SHA) -COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE") +#COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE") +COMMITSINCESTABLE=9 CURRENT_VERSION=$(node -p -e "require('./package.json').version") echo "Commits since stable: $COMMITSINCESTABLE"