From 60159617b837067013700decb405df83da3e5eba Mon Sep 17 00:00:00 2001 From: Core <64542347+coredev-uk@users.noreply.github.com> Date: Fri, 3 Jun 2022 15:18:35 +0100 Subject: [PATCH] ima just comment this as its clear if its beta or not based on commit count --- .circleci/config.yml | 24 ++++++++++++------------ resources/version.sh | 11 +++++++++-- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0745517f..fa43165f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -60,9 +60,9 @@ jobs: steps: - attach_workspace: at: ~/Cider - - run: - name: Fix Versioning and Add Channel - command: yarn circle:script +# - run: +# name: Fix Versioning and Add Channel +# command: yarn circle:script - run: name: Generate Builds (Linux) command: yarn electron-builder -l -p never @@ -89,9 +89,9 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update -y sudo apt-get install -y wine32 - - run: - name: Fix Versioning and Add Channel - command: yarn circle:script +# - run: +# name: Fix Versioning and Add Channel +# command: yarn circle:script - run: name: Generate Builds (Windows) command: yarn electron-builder -w --x64 -p never @@ -117,9 +117,9 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update -y sudo apt-get install -y wine32 - - run: - name: Fix Versioning and Add Channel - command: yarn circle:script +# - run: +# name: Fix Versioning and Add Channel +# command: yarn circle:script - run: name: Generate Builds (Winget) command: yarn electron-builder --win -c winget.json -p never @@ -156,9 +156,9 @@ jobs: mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts - store_artifacts: path: ~/Cider/dist/artifacts - - run: - name: Fix Versioning and Add Channel - command: yarn circle:script +# - run: +# name: Fix Versioning and Add Channel +# command: yarn circle:script - run: name: Set App Version command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 16 | head -1)" >> $BASH_ENV diff --git a/resources/version.sh b/resources/version.sh index 3e3850df..6db755e0 100755 --- a/resources/version.sh +++ b/resources/version.sh @@ -4,5 +4,12 @@ LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count) CURRENT_VERSION=$(node -p -e "require('./package.json').version") NEW_VERSION=${CURRENT_VERSION/-/.}.$COMMITSINCESTABLE -echo "Version: $NEW_VERSION" -sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json +if [[ $COMMITSINCESTABLE -gt 0 ]] +then + echo "Version: $NEW_VERSION" + sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json +else + echo "Version unchanged, commits since stable is 0" +fi + +