Remove Internal builds leftovers #23803

spencertransier · 2024-11-14T00:38:33Z

Summary

This PR removes the "Release-Internal" configuration and "WordPress Internal" scheme. Those were used for App Center builds that were uploaded during the release cycle. Those builds were disabled by @mokagio in March 2024. The prototype builds that are uploaded to App Center for each PR are still enabled (referred to as the Alpha configuration)--this is just for those release cycle builds.

Removes:

"Release-Internal" configuration from the project
"WordPress Internal" scheme from the project
The xcconfig files for the Internal configuration
Internal version helper methods in the Fastfile
Internal code signing methods

To test:

Verify that CI passes
Included in that, verify that the prototype build has been successfully created

PR submission checklist:

I have completed the Regression Notes.
I have considered adding unit tests for my changes.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Testing checklist:

dangermattic · 2024-11-14T00:39:09Z

	1 Warning
⚠️	This PR is larger than 500 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.

Generated by 🚫 Danger

wpmobilebot · 2024-11-14T00:47:58Z

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

	App Name	WordPress Alpha
	Configuration	Release-Alpha
	Build Number	pr23803-e5defff
	Version	25.4.2
	Bundle ID	org.wordpress.alpha
	Commit	`e5defff`
	App Center Build	WPiOS - One-Offs #11120

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

wpmobilebot · 2024-11-14T00:48:47Z

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

	App Name	Jetpack Alpha
	Configuration	Release-Alpha
	Build Number	pr23803-e5defff
	Version	25.4.2
	Bundle ID	com.jetpack.alpha
	Commit	`e5defff`
	App Center Build	jetpack-installable-builds #10160

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

spencertransier · 2024-11-20T01:18:37Z

config/WordPress.alpha.xcconfig

@@ -1,4 +1,4 @@
-#include "Version.internal.xcconfig"
+#include "Version.public.xcconfig"


We weren't really using the unique internal version xcconfig build number values once the release cycle builds were disabled in March. This change will just have the alpha/prototype builds use the release version number from the public file and will still continue to generate build numbers on-demand.

Sounds good.

spencertransier · 2024-11-20T01:19:26Z

config/WordPress.debug.xcconfig

@@ -1,4 +1,4 @@
-#include "Version.internal.xcconfig"
+#include "Version.public.xcconfig"


We weren't really using the unique internal version xcconfig build number values once the release cycle builds were disabled in March. This change will just have the debug builds use whatever the build number is in the public version file.

spencertransier · 2024-11-20T01:20:34Z

fastlane/Fastfile

 # Returns the build code of the app for the code freeze. It is the release version name plus sets the build number to 0
 #
 def build_code_code_freeze
  # Read the current build code from the .xcconfig file and parse it into an AppVersion object
  # The AppVersion is used because WP/JPiOS uses the four part (1.2.3.4) build code format, so the version
  # calculator can be used to calculate the next four-part version
-  release_version_current = VERSION_FORMATTER.parse(INTERNAL_VERSION_FILE.read_release_version)
+  release_version_current = VERSION_FORMATTER.parse(PUBLIC_VERSION_FILE.read_release_version)


I'm not sure why this was ever using the internal version file instead of the public one. So this change won't affect anything. The release version (e.g. 24.4) was the same between the public and internal files, anyway.

spencertransier · 2024-11-20T01:21:55Z

fastlane/lanes/build.rb

@@ -359,7 +359,7 @@ def build_and_upload_prototype_build(scheme:, output_app_name:, appcenter_app_na
    configuration = 'Release-Alpha'

    # Get the current build version, and update it if needed
-    version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.internal.xcconfig')
+    version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig')


Similar to the comments above, the public version file's release version (e.g. 24.4) is the same as the internal's, so this change won't affect anything. The build numbers were different between the public and internal, but for these prototype builds, their build numbers are generated on-demand anyway, superseding the existing build number.

I think this should work, as long as the lane is imported instead of required (import gives access to constants) after PUBLIC_VERSION_FILE is defined

Suggested change

version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig')

version_config_path = PUBLIC_VERSION_FILE

spencertransier · 2024-11-20T01:22:29Z

fastlane/lanes/release.rb

@@ -598,9 +570,8 @@ def prompt_for_confirmation(message:, bypass:)
  UI.confirm(message)
 end

-def bump_build_codes
+def bump_build_code


Updated this method name because only one build code is being updated now 🙂

mokagio

Looking good.

The usual caveat with any release-automation change is that issues are tricky to see and the only way to be sure nothing broke is to run the release. So here's a ping to @jkmassel to keep an eye out in the next release cycle and not hesitate to ping us.

Not approving yet because the prototype builds are failing to upload to App Center, which is odd because I cannot see any App Center change in this PR

https://buildkite.com/automattic/wordpress-ios/builds/24848#01934a52-447a-4a5c-9f65-fb1d5a26c023




[08:17:49]: Called from Fastfile at line 183
  | [08:17:49]: ```
  | [08:17:49]:     181:	  def execute_action(action_name)
  | [08:17:49]:     182:	    print_group(action_name)
  | [08:17:49]:  => 183:	    super
  | [08:17:49]:     184:	  end
  | [08:17:49]:     185:	end
  | [08:17:49]: ```
  | [08:17:49]: No URL provided to download or install the app.
  | - Either use this action right after using `appcenter_upload` and provide an `app_center_org_name` (so that this action can use the link to the App Center build)
  | - Or provide an explicit value for the `download_url` parameter
 ```

mokagio · 2024-11-22T02:33:26Z

config/WordPress.alpha.xcconfig

@@ -1,4 +1,4 @@
-#include "Version.internal.xcconfig"
+#include "Version.public.xcconfig"


Sounds good.

mokagio · 2024-11-22T02:36:04Z

fastlane/lanes/build.rb

@@ -359,7 +359,7 @@ def build_and_upload_prototype_build(scheme:, output_app_name:, appcenter_app_na
    configuration = 'Release-Alpha'

    # Get the current build version, and update it if needed
-    version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.internal.xcconfig')
+    version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig')


I think this should work, as long as the lane is imported instead of required (import gives access to constants) after PUBLIC_VERSION_FILE is defined

Suggested change

version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig')

version_config_path = PUBLIC_VERSION_FILE

mokagio

Not approving yet because the prototype builds are failing to upload to App Center, which is odd because I cannot see any App Center change in this PR

https://buildkite.com/automattic/wordpress-ios/builds/24848#01934a52-447a-4a5c-9f65-fb1d5a26c023
Nevermind. The cause for that App Center failure was upstream in the automation. The actual App Center upload got a 429.

[08:15:54]: ------------------------------
  | [08:15:54]: --- Step: appcenter_upload ---
  | [08:15:54]: ------------------------------
  | [08:15:55]: Starting release upload...
  | [08:16:11]: Retryable error creating release upload 429: {"code"=>"too_many_requests", "message"=>"Error: Too many requests on Distribution/Releases"}

I retried them to see if it's related to the changes here or it was an HTTP fluke.

mokagio

I retried them to see if it's related to the changes here or it was an HTTP fluke.

It was

🚀

spencertransier · 2024-11-22T03:34:28Z

Thank you @mokagio!

Remove Internal builds leftovers

8287403

Merge branch 'trunk' into remove/leftover-internal-build-code

03350be

spencertransier added the Tooling Build, Release, and Validation Tools label Nov 20, 2024

spencertransier marked this pull request as ready for review November 20, 2024 01:15

spencertransier requested a review from a team November 20, 2024 01:15

spencertransier added this to the 25.7 milestone Nov 20, 2024

spencertransier commented Nov 20, 2024

View reviewed changes

Merge branch 'trunk' into remove/leftover-internal-build-code

e5defff

mokagio reviewed Nov 22, 2024

View reviewed changes

mokagio approved these changes Nov 22, 2024

View reviewed changes

spencertransier added this pull request to the merge queue Nov 22, 2024

github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Nov 22, 2024

spencertransier added this pull request to the merge queue Nov 22, 2024

Merged via the queue into trunk with commit c86dd3e Nov 22, 2024
24 checks passed

spencertransier deleted the remove/leftover-internal-build-code branch November 22, 2024 05:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove Internal builds leftovers #23803

Remove Internal builds leftovers #23803

spencertransier commented Nov 14, 2024 •

edited

Loading

dangermattic commented Nov 14, 2024 •

edited

Loading

wpmobilebot commented Nov 14, 2024 •

edited

Loading

wpmobilebot commented Nov 14, 2024 •

edited

Loading

spencertransier Nov 20, 2024

mokagio Nov 22, 2024

spencertransier Nov 20, 2024

spencertransier Nov 20, 2024

spencertransier Nov 20, 2024

mokagio Nov 22, 2024

spencertransier Nov 20, 2024

mokagio left a comment

mokagio Nov 22, 2024

mokagio Nov 22, 2024

mokagio left a comment

mokagio left a comment

spencertransier commented Nov 22, 2024

		@@ -1,4 +1,4 @@
		#include "Version.internal.xcconfig"
		#include "Version.public.xcconfig"

	version_config_path = File.join(PROJECT_ROOT_FOLDER, 'config', 'Version.public.xcconfig')
	version_config_path = PUBLIC_VERSION_FILE

Remove Internal builds leftovers #23803

Remove Internal builds leftovers #23803

Conversation

spencertransier commented Nov 14, 2024 • edited Loading

Summary

dangermattic commented Nov 14, 2024 • edited Loading

wpmobilebot commented Nov 14, 2024 • edited Loading

wpmobilebot commented Nov 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mokagio left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mokagio left a comment

Choose a reason for hiding this comment

mokagio left a comment

Choose a reason for hiding this comment

spencertransier commented Nov 22, 2024

spencertransier commented Nov 14, 2024 •

edited

Loading

dangermattic commented Nov 14, 2024 •

edited

Loading

wpmobilebot commented Nov 14, 2024 •

edited

Loading

wpmobilebot commented Nov 14, 2024 •

edited

Loading