From efaa6b3b907cf1c6de6cd1795343bf5fec93d7d6 Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Wed, 3 Aug 2022 23:36:45 +0100 Subject: [PATCH] ready --- .github/workflows/build-macos.yml | 2 +- resources/version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index d924673c..60294db3 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -2,7 +2,7 @@ name: "macOS build" on: push: - branches: [ enhancement/ci ] + branches: [ main, stable ] paths-ignore: - 'README.md' - 'SECURITY.md' diff --git a/resources/version.sh b/resources/version.sh index a28a9a8b..d9464293 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -6,7 +6,7 @@ COMMITSINCESTABLE=$(git rev-list $STABLE_SHA..HEAD --count --since="$SHA_DATE") CURRENT_VERSION=$(node -p -e "require('./package.json').version") # Set the version number for commits on main branch -if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "enhancement/ci") && $COMMITSINCESTABLE -gt 0 ]]; then +if [[ ($CIRCLE_BRANCH == "main" || $GITHUB_REF_NAME == "main") && $COMMITSINCESTABLE -gt 0 ]]; then NEW_VERSION="${CURRENT_VERSION}-beta.${COMMITSINCESTABLE}" # Update the version in package.json