Bgerstle has submitted this change and it was merged.

Change subject: Fix alpha builds - use jenkins number for build number until we 
have the ability to push changes to gerrit.
......................................................................


Fix alpha builds - use jenkins number for build number until we have the 
ability to push changes to gerrit.

Change-Id: I6b1bd2bec3b6a1e9e7ccc8febd61448414e9d2df
---
M fastlane/Fastfile
M fastlane/lib/utils.rb
2 files changed, 12 insertions(+), 10 deletions(-)

Approvals:
  Bgerstle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 0bf2195..b58b73a 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -50,6 +50,9 @@
         force: true,
         filename: 'build/alpha.mobileprovision'
       )
+
+      increment_build_number ENV["BUILD_NUMBER"].to_i
+
       # uncomment when CI is able to push tags
       ipa(
         configuration: "Alpha",
diff --git a/fastlane/lib/utils.rb b/fastlane/lib/utils.rb
index e5fb350..50ce4cc 100644
--- a/fastlane/lib/utils.rb
+++ b/fastlane/lib/utils.rb
@@ -53,14 +53,13 @@
 
 # commit version bump, call a block, then push the bump to git
 def with_bump
-  if ENV['WMF_BUMP']
-    increment_build_number
-    commit_version_bump
-    plist_version = get_version_short_string 
File.expand_path(File.join(ENV['PWD'], 'Wikipedia/Wikipedia-Info.plist'))
-    # tag must be added after the version bump is committed
-    add_git_tag(tag: 
"#{plist_version}.#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::BUILD_NUMBER]}")
-  end
-  yield if block_given?
-  push_to_git_remote if ENV['WMF_BUMP']
+  # if ENV['WMF_BUMP']
+  #   increment_build_number
+  #   commit_version_bump
+  #   plist_version = get_version_short_string 
File.expand_path(File.join(ENV['PWD'], 'Wikipedia/Wikipedia-Info.plist'))
+  #   # tag must be added after the version bump is committed
+  #   add_git_tag(tag: 
"#{plist_version}.#{Fastlane::Actions.lane_context[Fastlane::Actions::SharedValues::BUILD_NUMBER]}")
+  # end
+  # yield if block_given?
+  # push_to_git_remote if ENV['WMF_BUMP']
 end
-

-- 
To view, visit https://gerrit.wikimedia.org/r/215367
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6b1bd2bec3b6a1e9e7ccc8febd61448414e9d2df
Gerrit-PatchSet: 1
Gerrit-Project: apps/ios/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Fjalapeno <cfl...@wikimedia.org>
Gerrit-Reviewer: Bgerstle <bgers...@wikimedia.org>
Gerrit-Reviewer: Mhurd <mh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to