Skip to content

Conversation

@iangmaia
Copy link
Contributor

@iangmaia iangmaia commented Oct 16, 2024

Follow up to the release backmerge #23673, where a couple of errors had to be fixed after running finalize_release: the lane ios_current_branch_is_hotfix was removed from release-toolkit but was still being used, and the options parameter was removed while still being passed to download_localized_strings_and_metadata (though not used).

This PR adds back the hotfix validation and properly removes the options parameter.

@iangmaia iangmaia added the Tooling Build, Release, and Validation Tools label Oct 16, 2024
@iangmaia iangmaia requested review from mokagio and oguzkocer October 16, 2024 19:12
@iangmaia iangmaia self-assigned this Oct 16, 2024
@iangmaia iangmaia added this to the 25.5 milestone Oct 16, 2024
@wpmobilebot
Copy link
Contributor

wpmobilebot commented Oct 16, 2024

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr23674-38ac3e5
Version25.4
Bundle IDcom.jetpack.alpha
Commit38ac3e5
App Center Buildjetpack-installable-builds #9868
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Oct 16, 2024

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr23674-38ac3e5
Version25.4
Bundle IDorg.wordpress.alpha
Commit38ac3e5
App Center BuildWPiOS - One-Offs #10826
Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

desc 'Trigger the final release build on CI'
lane :finalize_release do |options, skip_confirm: false|
lane :finalize_release do |skip_confirm: false|
UI.user_error!('To finalize a hotfix, please use the `finalize_hotfix_release` lane instead') if release_is_hotfix?
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's something about "release_is_hotfix?" that sounds odd.

I was going to suggest adding branch in the name, but that would be incorrect because the check is on the version file not the branch name.

Maybe current_version_is_hotfix? or is_hotfix?.

Not sure...

Copy link
Contributor Author

@iangmaia iangmaia Oct 17, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I got this method from Woo, which seems to have its name based on a release-toolkit method, but I agree -- renamed to current_version_hotfix? on 38ac3e5.

@iangmaia iangmaia force-pushed the iangmaia/fastlane-remove-unnecessary-params branch from 5153131 to 0245a0c Compare October 17, 2024 09:40
@iangmaia iangmaia force-pushed the iangmaia/fastlane-remove-unnecessary-params branch from 0245a0c to 38ac3e5 Compare October 17, 2024 09:49
@iangmaia iangmaia added this pull request to the merge queue Oct 18, 2024
Merged via the queue into trunk with commit 15ad1d7 Oct 18, 2024
1 check passed
@iangmaia iangmaia deleted the iangmaia/fastlane-remove-unnecessary-params branch October 18, 2024 10:56

def current_version_hotfix?
# Read the current release version from the .xcconfig file and parse it into an AppVersion object
current_version = VERSION_FORMATTER.parse(VERSION_FILE.read_release_version)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change caused a failure. I assume it was supposed to be PUBLIC_VERSION_FILE, so I made that change here.

cc @iangmaia

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was supposed to be PUBLIC_VERSION_FILE

Indeed, that is the case. Thanks for changing it!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Tooling Build, Release, and Validation Tools

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants