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

Commit build number with beta 

Pick base build number from env, not project. Can now drop
fetch-depth 0 from workflow, no needs for commits count.
This commit is contained in:
Davide De Rosa 2021-11-28 22:46:35 +01:00
parent f158f4998e
commit 51821660d2
10 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@ -1,3 +1,4 @@
# constant (fastlane)
LC_ALL="en_US.UTF-8"
LANG="en_US.UTF-8"
BASE_BUILD_NUMBER="1071"

5
.github/workflows/beta.yml vendored
View File

@ -34,7 +34,6 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- name: Prepare build
uses: ./.github/actions/prepare-build-app
@ -48,7 +47,6 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- name: Prepare build
uses: ./.github/actions/prepare-build-app
@ -67,7 +65,6 @@ jobs:
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- name: Prepare build
uses: ./.github/actions/prepare-build-app
@ -93,7 +90,6 @@ jobs:
- name: Check out repository
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- name: Prepare Ruby bundle
uses: ruby/setup-ruby@v1
@ -122,7 +118,6 @@ jobs:
- name: Check out repository
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true
- name: Prepare Ruby bundle
uses: ruby/setup-ruby@v1

4
Passepartout.xcodeproj/project.pbxproj
View File

@ -1426,7 +1426,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1071;
CURRENT_PROJECT_VERSION = 2935;
DEBUG_INFORMATION_FORMAT = dwarf;
ENABLE_BITCODE = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -1492,7 +1492,7 @@
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CURRENT_PROJECT_VERSION = 1071;
CURRENT_PROJECT_VERSION = 2935;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
ENABLE_BITCODE = NO;
ENABLE_NS_ASSERTIONS = NO;

2
Passepartout/App/iOS/Info.plist
View File

@ -35,7 +35,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1071</string>
<string>2935</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

2
Passepartout/App/macOS/Info.plist
View File

@ -34,7 +34,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1071</string>
<string>2935</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>

2
Passepartout/App/macOS/Launcher/Info.plist
View File

@ -21,7 +21,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1071</string>
<string>2935</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSApplicationCategoryType</key>

2
Passepartout/Tunnel/Info.plist
View File

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>1.17.2</string>
<key>CFBundleVersion</key>
<string>1071</string>
<string>2935</string>
<key>LSMinimumSystemVersion</key>
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSExtension</key>

2
PassepartoutCore/Sources/PassepartoutCore/API

@ -1 +1 @@
Subproject commit 666d370e838973fcac8d5271d0e54b1703f2ca3b
Subproject commit a35886548dd3068e4173d51dd448288b45ad3eff

2
Submodules/fastlane-ci-templates

@ -1 +1 @@
Subproject commit 149a7f44475708f5b75889fd489bdbd6a063232b
Subproject commit 26620d596ca3bbc25be6cc2efa2b52797021379a

23
scripts/commit-beta.sh
View File

@ -5,17 +5,32 @@ if [[ $CURRENT_BRANCH != "master" ]]; then
exit
fi
# just in case
scripts/after-beta.sh
# set build number
. .env
BUILD=$((BASE_BUILD_NUMBER + `git rev-list HEAD --count` + 1))
ci/set-build.sh $BUILD
# set release notes
ci/update-changelog.sh ios &&
ci/update-changelog.sh mac &&
ci/copy-release-notes.sh ios &&
ci/copy-release-notes.sh mac
# pull latest API
git -C PassepartoutCore/Sources/PassepartoutCore/API pull origin master
git add */PassepartoutCore/API
# add build number
git add Passepartout.xcodeproj
git add *.plist
# add release notes
git add Passepartout/App/*/CHANGELOG.md
git add Passepartout/App/*/fastlane/metadata/*/release_notes.txt
git commit -m "Set beta release"
VERSION=`ci/version-number.sh ios`
BUILD=`ci/build-number.sh ios`
git tag "v$VERSION-b$BUILD"
git commit -m "Set beta release"
#VERSION=`ci/version-number.sh ios`
#git tag "v$VERSION-b$BUILD"