passepartoutvpn
/
passepartout-apple
mirror of https://github.com/passepartoutvpn/passepartout-apple.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refine beta commit script 

- Ensure API pull succeeds (do it early)

- Include base build number
This commit is contained in:
Davide De Rosa 2022-09-25 11:10:46 +02:00
parent 45827271c0
commit 4327e4ca52
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.beta-base
View File

@ -1 +1 @@
1120 1123

19
scripts/commit-beta.sh
View File

@ -5,10 +5,18 @@ if [[ $CURRENT_BRANCH != "master" ]]; then
exit 1 exit 1
fi fi
# pull latest API
API_PATH="PassepartoutLibrary/Sources/PassepartoutServices/API"
if ! git -C $API_PATH pull origin master; then
echo "Could not pull API"
exit 1
fi
git add $API_PATH
# set build number # set build number
BASE_BUILD_NUMBER=`cat .beta-base` BASE_BUILD_FILE=".beta-base"
BUILD_FILE=".beta-build" BUILD_FILE=".beta-build"
BUILD=$((BASE_BUILD_NUMBER + `git rev-list HEAD --count` + 1)) BUILD=$((`cat $BASE_BUILD_FILE` + `git rev-list HEAD --count` + 1))
ci/set-build.sh $BUILD ci/set-build.sh $BUILD
echo $BUILD >$BUILD_FILE echo $BUILD >$BUILD_FILE
@ -18,13 +26,8 @@ ci/update-release-notes.sh ios &&
ci/copy-release-notes.sh ios && ci/copy-release-notes.sh ios &&
ci/copy-release-notes.sh mac ci/copy-release-notes.sh mac
# pull latest API
API_PATH="PassepartoutLibrary/Sources/PassepartoutServices/API"
git -C $API_PATH pull origin master
git add $API_PATH
# add build number # add build number
git add $BUILD_FILE git add $BASE_BUILD_FILE $BUILD_FILE
git add Passepartout.xcodeproj git add Passepartout.xcodeproj
git add *.plist git add *.plist