From 28add2df5a9c9d7cab2bab235266ea1b119e5c88 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Wed, 3 Aug 2022 22:08:42 +0100 Subject: [PATCH] Ready for merge :) --- .github/workflows/build-macos.yml | 3 --- resources/version.sh | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 0bbb17ab..10991015 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -11,9 +11,6 @@ on: - 'LICENSE' - 'cider.lock' -permissions: - contents: write - jobs: build-macos: name: build-macos diff --git a/resources/version.sh b/resources/version.sh index c01d66c7..12928ad5 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -2,8 +2,7 @@ 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=22 +COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE") CURRENT_VERSION=$(node -p -e "require('./package.json').version") echo "Commits since stable: $COMMITSINCESTABLE"