WCiOS: Update Fastfile with version model #10807

spencertransier · 2023-09-28T18:49:35Z

Summary

This PR integrates the new version and build code models from Add Version Models and Formatter/Calculator Classes wordpress-mobile/release-toolkit#512
It currently points to a development version of the Release Toolkit so that I could test out the call site implementation before releasing a new version of the Release Toolkit.
Nearly all of the precheck actions from the Release Toolkit were tightly coupled with the existing version methods. To simplify things with the new version model, I took the relevant snippets from the precheck actions and added them directly here. This is something that I've discussed with Olivier and Jeremy before in the context of "no one knows what the precheck actions do unless you dive deep down into the RT". These changes are somewhat opposite of DRY, but I think it's worth it for transparency. We may also decide in the future to create smaller actions that do more specific things versus the existing precheck and version bump actions that combine many disparate methods.

Before Merging

Point the Release Toolkit to a stable version

spencertransier · 2023-09-28T18:52:44Z

fastlane/Fastfile

@@ -1219,10 +1295,62 @@ def inject_buildkite_analytics_environment(xctestrun_path:)
  File.write(xctestrun_path, Plist::Emit.dump(xctestrun))
 end

-# Returns the version of the app based on the specified xcconfig file
+


I created a test lane that verified these values are being calculated and formatted as expected (given a VERSION_LONG of 15.5.2 and a VERSION_SHORT of 15.5.2.4):

spencertransier · 2023-09-28T18:53:50Z

fastlane/Fastfile

-  # bundle exec fastlane build_and_upload_beta skip_confirm:true
-  #####################################################################################
-  desc 'Builds and uploads for distribution'
-  lane :build_and_upload_beta do |options|


After searching the release scenario, Buildkite scripts, and Buildkite pipelines, I did not find any instances of this lane being used.

spencertransier · 2023-09-28T18:53:57Z

fastlane/Fastfile

-  # bundle exec fastlane build_and_upload_release skip_confirm:true
-  #####################################################################################
-  desc 'Builds and uploads for distribution'
-  lane :build_and_upload_release do |options|


After searching the release scenario, Buildkite scripts, and Buildkite pipelines, I did not find any instances of this lane being used.

spencertransier · 2023-09-28T18:55:20Z

fastlane/Fastfile

+# Instanstiate versioning classes
+VERSION_CALCULATOR = Fastlane::Wpmreleasetoolkit::Versioning::MarketingVersionCalculator.new
+VERSION_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartVersionFormatter.new
+BUILD_CODE_FORMATTER = Fastlane::Wpmreleasetoolkit::Versioning::FourPartBuildCodeFormatter.new
+VERSION_FILE = Fastlane::Wpmreleasetoolkit::Versioning::IOSVersionFile.new(xcconfig_path: PUBLIC_CONFIG_FILE)


This is where the various version and build code formatters/calculators are instantiated to be used by the rest of the Fastfile.

…es before every lane

spencertransier · 2023-09-28T19:01:17Z

fastlane/Fastfile

-  # Ensure we use the latest version of the toolkit
-  check_for_toolkit_updates unless is_ci || ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']
-


I moved this check to the top of the code_freeze lane instead of before_all. It hasn't been useful to have it run before every single lane during the course of a release.

wpmobilebot · 2023-09-28T19:14:03Z

📲 You can test the changes from this Pull Request in WooCommerce iOS by scanning the QR code below to install the corresponding build.

	App Name	WooCommerce iOS
	Build Number	pr10807-97204c6
	Version	15.9
	Bundle ID	com.automattic.alpha.woocommerce
	Commit	`97204c6`
	App Center Build	WooCommerce - Prototype Builds #6666

Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

fastlane/Fastfile

AliSoftware · 2023-09-29T19:16:40Z

fastlane/Fastfile

@@ -542,7 +618,7 @@ platform :ios do
    archive_zip_path = File.join(File.dirname(Dir.pwd), 'WooCommerce.xarchive.zip')
    zip(path: lane_context[SharedValues::XCODEBUILD_ARCHIVE], output_path: archive_zip_path)

-    version = options[:beta_release] ? ios_get_build_version : app_version
+    version = options[:beta_release] ? current_build_code : current_release_version
    create_release(
      repository: GITHUB_REPO,
      version:,


Missing a value for this parameter here 🤔

That's the Ruby 3 convention of not needing to include the argument if the name of the argument is the same as the name of the parameter.

fastlane/Fastfile

spencertransier · 2023-10-29T21:44:57Z

@mokagio I've updated this one with the changes from WP/JPiOS, so it is ready to review again.

Remove unneeded env vars from Fastfile

fastlane/Fastfile

Co-authored-by: Gio Lodi <[email protected]>

fastlane/Fastfile

spencertransier · 2023-11-01T05:05:24Z

@mokagio Thank you for taking another look! Sorry, I thought I had already fixed most of those cases for WCiOS, but I think I was getting it mixed up with another app 🤪. All your comments are now addressed 👍

mokagio

All looks good. At this point, the best thing to do is to merge and see how we go on the next code freeze 👍

spencertransier added 7 commits September 27, 2023 02:47

Begin using the Version model methods

ebc1612

Finish replacing current methods with Version model

f560c1d

Use development branch of the Release Toolkit

5d683b9

Temporarily disable git clean and commit bump

d530714

Use VERSION_FILE constant

21d1da0

Fix typo and Rubocop violation

8a9bd93

Add additional methods for returning versions and build codes

6a26235

spencertransier added the category: tooling Anything that involves building & maintaining the project, including scripts, `Fastfile`, etc. label Sep 28, 2023

spencertransier added this to the 15.6 milestone Sep 28, 2023

spencertransier requested review from AliSoftware and jkmassel September 28, 2023 18:49

spencertransier commented Sep 28, 2023

View reviewed changes

spencertransier added 2 commits September 28, 2023 11:56

Uncomment a Git checkout command and don't run the check for RT updat…

773ad9d

…es before every lane

Fixed rubocop violations

e02f557

spencertransier commented Sep 28, 2023

View reviewed changes

spencertransier and others added 3 commits September 28, 2023 12:27

Merge branch 'trunk' into update/release-toolkit-version-model

ed55774

Update Gemfile.lock

bacb6c9

Update Release Toolkit

fb8bd22

spencertransier changed the title ~~Update Fastfile with version model~~ WCiOS: Update Fastfile with version model Sep 29, 2023

Update Release Toolkit revision

76541bb

spencertransier modified the milestones: 15.6, 15.7 Sep 29, 2023

AliSoftware reviewed Sep 29, 2023

View reviewed changes

spencertransier added 3 commits September 29, 2023 19:22

Update Release Toolkit to 9.1.0

ec0ea11

Update override_default_release_branch

be0e00a

Update minimum Release Toolkit to 9.1

5e77912

Update version and build code method names

fc2993e

spencertransier modified the milestones: 15.9, 16.0 Oct 20, 2023

spencertransier added 3 commits October 20, 2023 22:09

Remove three environment variables

46d2569

Update release notes constant name

6d0df8d

Remove unneeded PUBLIC_CONFIG_FILE env var

5e2bc26

spencertransier requested a review from mokagio October 29, 2023 21:38

spencertransier and others added 2 commits October 29, 2023 14:41

Merge branch 'trunk' into update/release-toolkit-version-model

5d19d4d

Update Release Toolkit to 9.2.0

402df9d

spencertransier modified the milestones: 16.0 ❄️, 16.1 Oct 29, 2023

Merge pull request #10982 from woocommerce/remove/env-vars-from-fastfile

02ea100

Remove unneeded env vars from Fastfile

mokagio reviewed Nov 1, 2023

View reviewed changes

spencertransier and others added 5 commits October 31, 2023 21:35

Use positive logic

f41ba08

Co-authored-by: Gio Lodi <[email protected]>

Remove unneeded branch check

02fa6fc

Co-authored-by: Gio Lodi <[email protected]>

Move git clean check to beginning of lane

01da9ab

Use positive logic

dc304e5

Push local changes during hotfix finalization

8a70f61

wpmobilebot reviewed Nov 1, 2023

View reviewed changes

fastlane/Fastfile Outdated Show resolved Hide resolved

spencertransier added 2 commits October 31, 2023 21:53

Remove extra parentheses

5cd92da

Add commit_version_bump method to Fastfile

97204c6

spencertransier requested a review from mokagio November 1, 2023 05:04

spencertransier modified the milestones: 16.1, 16.2 Nov 3, 2023

mokagio approved these changes Nov 8, 2023

View reviewed changes

spencertransier merged commit 50c0e16 into trunk Nov 8, 2023
22 checks passed

spencertransier deleted the update/release-toolkit-version-model branch November 8, 2023 04:52

spencertransier mentioned this pull request Jul 27, 2024

Deprecate all iOS and Android precheck actions wordpress-mobile/release-toolkit#577

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

WCiOS: Update Fastfile with version model #10807

WCiOS: Update Fastfile with version model #10807

spencertransier commented Sep 28, 2023 •

edited

Loading

spencertransier Sep 28, 2023 •

edited

Loading

spencertransier Sep 28, 2023

spencertransier Sep 28, 2023

spencertransier Sep 28, 2023

spencertransier Sep 28, 2023

wpmobilebot commented Sep 28, 2023 •

edited

Loading

AliSoftware Sep 29, 2023

spencertransier Sep 30, 2023

spencertransier commented Oct 29, 2023

spencertransier commented Nov 1, 2023

mokagio left a comment

		# Ensure we use the latest version of the toolkit
		check_for_toolkit_updates unless is_ci \|\| ENV['FASTLANE_SKIP_TOOLKIT_UPDATE_CHECK']

WCiOS: Update Fastfile with version model #10807

WCiOS: Update Fastfile with version model #10807

Conversation

spencertransier commented Sep 28, 2023 • edited Loading

Summary

Before Merging

spencertransier Sep 28, 2023 • edited Loading

Choose a reason for hiding this comment

spencertransier Sep 28, 2023

Choose a reason for hiding this comment

spencertransier Sep 28, 2023

Choose a reason for hiding this comment

spencertransier Sep 28, 2023

Choose a reason for hiding this comment

spencertransier Sep 28, 2023

Choose a reason for hiding this comment

wpmobilebot commented Sep 28, 2023 • edited Loading

AliSoftware Sep 29, 2023

Choose a reason for hiding this comment

spencertransier Sep 30, 2023

Choose a reason for hiding this comment

spencertransier commented Oct 29, 2023

spencertransier commented Nov 1, 2023

mokagio left a comment

Choose a reason for hiding this comment

spencertransier commented Sep 28, 2023 •

edited

Loading

spencertransier Sep 28, 2023 •

edited

Loading

wpmobilebot commented Sep 28, 2023 •

edited

Loading