okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ima just comment this as its clear if its beta or not based on commit count

Browse source
This commit is contained in:
Core 2022-06-03 15:18:35 +01:00
parent 4844fcc29f
commit 60159617b8
No known key found for this signature in database
GPG key ID: FE9BF1B547F8F3C6
2 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.circleci/config.yml
View file

@ -60,9 +60,9 @@ jobs:
steps: steps:
- attach_workspace: - attach_workspace:
at: ~/Cider at: ~/Cider
- run: # - run:
name: Fix Versioning and Add Channel # name: Fix Versioning and Add Channel
command: yarn circle:script # command: yarn circle:script
- run: - run:
name: Generate Builds (Linux) name: Generate Builds (Linux)
command: yarn electron-builder -l -p never command: yarn electron-builder -l -p never
@ -89,9 +89,9 @@ jobs:
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update -y sudo apt-get update -y
sudo apt-get install -y wine32 sudo apt-get install -y wine32
- run: # - run:
name: Fix Versioning and Add Channel # name: Fix Versioning and Add Channel
command: yarn circle:script # command: yarn circle:script
- run: - run:
name: Generate Builds (Windows) name: Generate Builds (Windows)
command: yarn electron-builder -w --x64 -p never command: yarn electron-builder -w --x64 -p never
@ -117,9 +117,9 @@ jobs:
sudo dpkg --add-architecture i386 sudo dpkg --add-architecture i386
sudo apt-get update -y sudo apt-get update -y
sudo apt-get install -y wine32 sudo apt-get install -y wine32
- run: # - run:
name: Fix Versioning and Add Channel # name: Fix Versioning and Add Channel
command: yarn circle:script # command: yarn circle:script
- run: - run:
name: Generate Builds (Winget) name: Generate Builds (Winget)
command: yarn electron-builder --win -c winget.json -p never command: yarn electron-builder --win -c winget.json -p never
@ -156,9 +156,9 @@ jobs:
mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts mv ~/Cider/dist/*.blockmap ~/Cider/dist/artifacts
- store_artifacts: - store_artifacts:
path: ~/Cider/dist/artifacts path: ~/Cider/dist/artifacts
- run: # - run:
name: Fix Versioning and Add Channel # name: Fix Versioning and Add Channel
command: yarn circle:script # command: yarn circle:script
- run: - run:
name: Set App Version name: Set App Version
command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 16 | head -1)" >> $BASH_ENV command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 16 | head -1)" >> $BASH_ENV

11
resources/version.sh
View file

@ -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) COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
CURRENT_VERSION=$(node -p -e "require('./package.json').version") CURRENT_VERSION=$(node -p -e "require('./package.json').version")
NEW_VERSION=${CURRENT_VERSION/-/.}.$COMMITSINCESTABLE NEW_VERSION=${CURRENT_VERSION/-/.}.$COMMITSINCESTABLE
echo "Version: $NEW_VERSION" if [[ $COMMITSINCESTABLE -gt 0 ]]
sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json 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