[Tooling] Fix hotfix lanes #1373
Conversation
AliSoftware
added
the
tooling
|
You can trigger optional UI/connected tests for these changes by visiting CircleCI here. |
|
You can trigger an installable build for these changes by visiting CircleCI here. |
AliSoftware
changed the title
There was a problem hiding this comment.
- Verify that it cut a
release/4.40.1branch from the4.40tag - Verify that it bumped the version in
Version.public.xcconfigandfastlane/Deliverfile(*) - Run
bundle exec fastlane finalize_release. You should get an error telling you that you should usefinalize_hotfix_releasefor hotfix branches instead - Run
bundle exec fastlane finalize_hotfix_releaseand verify that it triggered a release build, and that is is building it from the release/4.40.1 hotfix branch. Cancel the CI build immediately.
All checks! 👍
| @@ -193,7 +193,7 @@ end | |||
| # bundle exec fastlane new_hotfix_release version:10.6.1 | |||
| # bundle exec fastlane new_hotfix_release skip_confirm:true version:10.6.1 | |||
| ##################################################################################### | |||
| desc "Creates a new hotfix branch from the given tag" | |||
| desc 'Creates a new hotfix branch for the given version:x.y.z. The branch will be cut from the tag x.y of the previous release' | |||
There was a problem hiding this comment.
See my comment here: woocommerce/woocommerce-ios#4703 (comment)
I'm mentioning it not because I feel strongly that it should be addressed, but just in case you look at one PR before the other.
There was a problem hiding this comment.
Noted. Sadly, some of the other PRs that are aligning the hotfix lanes in other repos have already been merged with that same description. With that and the fact that I'm not sure what could be a nice wording that explains this but also doesn't make the description too complex to understand trying to cover all cases, I'm not sure if it's worth re-opening yet another PR on the other repos just to fix that wording on the repos that have already had their hotfix-lane-PRs merged? wdyt?
There was a problem hiding this comment.
I agree with you. This can stay the way it is. 👍
Part of the paaHJt-1WQ-p2 project.
Note: In the case of SNiOS, not much has been changed on the hotfix lanes as part of this PR (except the lane's description to make them more descriptive), but as part of this project, it's still worth going through the test scenario below to ensure that hotfix were already working as expected (and didn't break in the past but got unnoticed)
To test
bundle installbundle exec fastlane new_hotfix_release version:4.40.1release/4.40.1branch from the4.40tagVersion.public.xcconfigandfastlane/Deliverfile(*)release/4.40.1branch. This is because we are gonna test the updated finalize lanes, and need to be on the hotfix release branch to test them. (You might get conflicts during the cherry-pick)bundle exec fastlane finalize_release. You should get an error telling you that you should usefinalize_hotfix_releasefor hotfix branches insteadbundle exec fastlane finalize_hotfix_releaseand verify that it triggered a release build, and that is is building it from the release/4.40.1 hotfix branch. Cancel the CI build immediately.release/4.40.1branch (from both local and remote)A note on Deliverfile bump
@mokagio is working on removing the
Deliverfile– see wordpress-mobile/release-toolkit#287 – in our repos, to rundeliveras part of a lane to which we'll explicitly pass the right parameters, including the version, hence the bump not needing to change the app version inDeliverfileanymore in the future.This means that once @mokagio's work lands, the hotfix lanes will need to be amended again, to specify that the
Deliverfileshould not be updated as part of any version bump… including hotfix ones. This work will be done separately to the hotfix alignment work from this PR, to avoid postponing things too much and blocking the project.