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

this annoys me

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

2
resources/circle.js
View file

@ -15,7 +15,7 @@ const patch = version[2].split('-');
if (process.env['CIRCLE_BRANCH'] === 'release') { if (process.env['CIRCLE_BRANCH'] === 'release') {
pkg.version = `${version[0]}.${version[1]}.${patch[0]}` pkg.version = `${version[0]}.${version[1]}.${patch[0]}`
} else if (process.env['CIRCLE_BRANCH'] === 'main') { } else if (process.env['CIRCLE_BRANCH'] === 'main') {
pkg.version = `${version[0]}.${version[1]}.${patch[0]}-beta.${patch[1]}` pkg.version = `${version[0]}.${version[1]}.${patch[0]}.beta.${patch[1]}`
} else { } else {
pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}` pkg.version = `${version[0]}.${version[1]}.${patch[0]}-${channel}.${process.env['CIRCLE_BUILD_NUM']}`
} }

12
resources/version.sh
View file

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
LATESTSHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs) LATEST_SHA=$(curl -s https://api.github.com/repos/ciderapp/Cider/branches/stable | grep sha | cut -d '"' -f 4 | sed 's/v//' | xargs)
COMMITSINCESTABLE=$(git rev-list $LATESTSHA..HEAD --count) COMMITSINCESTABLE=$(git rev-list $LATEST_SHA..HEAD --count)
VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1) CURRENT_VERSION=$(node -p -e "require('./package.json').version")
echo NEW_VERSION=${CURRENT_VERSION/-/.}.$COMMITSINCESTABLE
NEWVERSION=${VERSION/-/.}-$COMMITSINCESTABLE echo "Version: $NEW_VERSION"
npm version $NEWVERSION sed -i "0,/$CURRENT_VERSION/s//$NEW_VERSION/" package.json