From 2d09ae1f4e27471f17f79f7c656b11116c787656 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Thu, 4 Aug 2022 18:43:31 +0100 Subject: [PATCH] Test3e9 --- .github/workflows/build-macos.yml | 3 +-- resources/version.sh | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index fcd4880a..bd66f516 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -36,9 +36,8 @@ jobs: - name: Change Version env: - REQUEST_TOKEN: ${{ secrets.RELEASE_TOKEN }} + GH_REQUEST_TOKEN: ${{ secrets.RELEASE_TOKEN }} run: | - curl -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4 sudo chmod +x resources/version.sh && ./resources/version.sh || true - name: Sign in to EVS diff --git a/resources/version.sh b/resources/version.sh index f62b0637..1a1a0d3b 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -1,7 +1,12 @@ #!/bin/bash # Setup the variables needed -STABLE_SHA=$(curl -H "Authorization: token ${REQUEST_TOKEN}" https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4) +if [[ $GITHUB_REF_NAME == "main" ]]; then + STABLE_SHA=$(curl -H "Authorization: token ${GH_REQUEST_TOKEN}" https://api.github.com/repos/ciderapp/Cider/branches/stable | grep '"sha"' | head -1 | cut -d '"' -f 4) +else + STABLE_SHA=$(curl -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/ciderapp/Cider/branches/main | grep '"sha"' | head -1 | cut -d '"' -f 4) +fi + SHA_DATE=$(git show -s --format=%ci $STABLE_SHA) COMMIT_SINCE_STABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE") CURRENT_VERSION=$(node -p -e "require('./package.json').version")