Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/210393
Change subject: bump to 4.1.4.0, implement versioning in fastlane
......................................................................
bump to 4.1.4.0, implement versioning in fastlane
Versioning scheme:
- "Public/marketing version" is manually maintained in the app's Info.plist
- Build numbers are monotonically incremented by the fastlane alpha lane
(and reset as necessary when release version is bumped)
- After a successful alpha deployment, the version bumps are commited, tagged,
and pushed to master
Bug: T97812
Change-Id: I10ab4db69a169b5afb2b2d309f67c611e245278a
---
M Wikipedia.xcodeproj/project.pbxproj
M Wikipedia/Wikipedia-Info.plist
M fastlane/.env
M fastlane/Fastfile
4 files changed, 20 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/93/210393/1
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index 2ab43f6..d19e5a1 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -3458,6 +3458,7 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
+ VERSIONING_SYSTEM = "apple-generic";
};
name = Alpha;
};
@@ -3470,6 +3471,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Distribution";
+ CURRENT_PROJECT_VERSION = 0;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -3513,7 +3515,7 @@
"$(inherited)",
);
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- INFOPLIST_FILE = WikipediaUnitTests/Info.plist;
+ INFOPLIST_FILE = "WikipediaUnitTests/Supporting
Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)
@executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
@@ -3558,6 +3560,7 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
+ VERSIONING_SYSTEM = "apple-generic";
};
name = Beta;
};
@@ -3570,6 +3573,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Distribution";
+ CURRENT_PROJECT_VERSION = 0;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -3613,7 +3617,7 @@
"$(inherited)",
);
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
- INFOPLIST_FILE = WikipediaUnitTests/Info.plist;
+ INFOPLIST_FILE = "WikipediaUnitTests/Supporting
Files/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited)
@executable_path/Frameworks @loader_path/Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
@@ -3711,6 +3715,7 @@
RUN_CLANG_STATIC_ANALYZER = NO;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
+ VERSIONING_SYSTEM = "apple-generic";
};
name = Debug;
};
@@ -3750,6 +3755,7 @@
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
+ VERSIONING_SYSTEM = "apple-generic";
};
name = Release;
};
@@ -3762,7 +3768,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Developer";
- CURRENT_PROJECT_VERSION = 2;
+ CURRENT_PROJECT_VERSION = 0;
DEBUG_INFORMATION_FORMAT = dwarf;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -3778,7 +3784,6 @@
PRODUCT_NAME = "Wikipedia ${CONFIGURATION}";
PROVISIONING_PROFILE = "";
RUN_CLANG_STATIC_ANALYZER = NO;
- VERSIONING_SYSTEM = "apple-generic";
WARNING_CFLAGS = (
"$(inherited)",
"-Werror=switch",
@@ -3799,7 +3804,7 @@
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME =
LaunchImage;
CODE_SIGN_IDENTITY = "iPhone Distribution";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone
Distribution";
- CURRENT_PROJECT_VERSION = 2;
+ CURRENT_PROJECT_VERSION = 0;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -3814,7 +3819,6 @@
PRODUCT_NAME = Wikipedia;
PROVISIONING_PROFILE = "";
RUN_CLANG_STATIC_ANALYZER = NO;
- VERSIONING_SYSTEM = "apple-generic";
WARNING_CFLAGS = (
"$(inherited)",
"-Werror=switch",
diff --git a/Wikipedia/Wikipedia-Info.plist b/Wikipedia/Wikipedia-Info.plist
index 7aedf2b..b910f98 100644
--- a/Wikipedia/Wikipedia-Info.plist
+++ b/Wikipedia/Wikipedia-Info.plist
@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>4.1.3</string>
+ <string>4.1.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>96</string>
+ <string>0</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSLocationWhenInUseUsageDescription</key>
diff --git a/fastlane/.env b/fastlane/.env
index 0302e9a..429d9d6 100644
--- a/fastlane/.env
+++ b/fastlane/.env
@@ -2,3 +2,4 @@
export IPA_CLEAN=1
export IPA_ARCHIVE=1
export IPA_DESTINATION='build'
+export FL_BUILD_NUMBER_PROJECT='Wikipedia.xcodeproj'
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 3b912f8..c142d2a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -48,15 +48,11 @@
lane :alpha do
# snapshot
sigh
-
+ increment_build_number
+ commit_version_bump
plist_version = get_version_short_string
File.expand_path(File.join(ENV['PWD'], 'Wikipedia/Wikipedia-Info.plist'))
-
- increment_version_number(
- version_number: ENV['WMF_VERSION_NUMBER'] || plist_version
- )
- increment_build_number(
- build_number: ENV['BUILD_NUMBER'].to_i
- )
+ # tag must be added after the version bump is committed
+ add_git_tag(tag:
"#{plist_version}.#{Actions.lane_context[Actions::SharedValues::BUILD_NUMBER]}")
ipa(
configuration: "Alpha",
scheme: "Wikipedia Alpha",
@@ -67,7 +63,9 @@
status: '1', #Means do not make available for download
})
deliver skip_deploy: true, beta: true
- end
+ # only push after everything else has succeeded
+ push_to_git_remote
+ end
desc "Submit a new **Wikipedia Beta** build to Apple TestFlight"
lane :beta do
--
To view, visit https://gerrit.wikimedia.org/r/210393
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I10ab4db69a169b5afb2b2d309f67c611e245278a
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
