-
Notifications
You must be signed in to change notification settings - Fork 301
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge release 2.34 into trunk
#1695
Merged
Merged
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
77d2a03
Add message to allow user to login manually in the enter email screen.
f1a36ae
Change using spans directly and use html.toHtml instead.
1c149f9
Add message to allow user to login manually in the enter email screen…
notandyvee aebb6a3
Remove out-of-date parameter from `download_metadata_strings` call
mokagio 7d5fd2c
Remove `ci_releases.rb` – We decided not to track them
mokagio c38e3c6
Move `finalize_release` to `fastlane/lanes/release.rb`
mokagio ec7a563
Replace `create_release_management_pull_request` with new backmerge
mokagio 1a5436c
Add `publish_release` lane
mokagio ffc4b50
Add Buildkite pipelines to finalize and publish releases in CI
mokagio 2f69029
Explicitly pass `wpmobilebot` to secure agent command
mokagio c358ba1
Update translations
mokagio 851e61f
Bump version name and build code
mokagio 45a8201
Update metadata translations for 2.34
mokagio adc8fef
Remove unnecessary `version` parameter
mokagio 1030049
Do not remove branch protection in `finalize_release`
mokagio File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json | ||
--- | ||
|
||
steps: | ||
- label: Finalize Release | ||
plugins: [$CI_TOOLKIT_PLUGIN] | ||
command: | | ||
echo '--- :robot_face: Use bot for git operations' | ||
source use-bot-for-git wpmobilebot | ||
|
||
echo '--- :git: Checkout Release Branch' | ||
.buildkite/commands/checkout-release-branch.sh | ||
|
||
echo '--- :ruby: Set up Ruby Tools' | ||
install_gems | ||
|
||
echo '--- :shipit: Finalize Release' | ||
bundle exec fastlane finalize_release skip_confirm:true | ||
agents: | ||
queue: tumblr-metal | ||
retry: | ||
manual: | ||
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite | ||
allowed: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json | ||
--- | ||
|
||
steps: | ||
- label: Publish Release | ||
plugins: [$CI_TOOLKIT_plugin] | ||
command: | | ||
echo '--- :robot_face: Use bot for git operations' | ||
source use-bot-for-git wpmobilebot | ||
|
||
echo '--- :git: Checkout Release Branch' | ||
.buildkite/commands/checkout-release-branch.sh | ||
|
||
echo '--- :ruby: Setup Ruby Tools' | ||
install_gems | ||
|
||
echo '--- :package: Publish Release' | ||
bundle exec fastlane publish_release skip_confirm:true | ||
agents: | ||
queue: tumblr-metal | ||
retry: | ||
manual: | ||
# If those jobs fail, one should always prefer re-triggering a new build from ReleaseV2 rather than retrying the individual job from Buildkite | ||
allowed: false |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -169,64 +169,6 @@ platform :android do | |
trigger_release_build(branch_to_build: release_branch_name) | ||
end | ||
|
||
desc 'Updates store metadata and runs the release checks' | ||
lane :finalize_release do |skip_confirm: false| | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Moved to |
||
UI.user_error!('Please use `finalize_hotfix_release` lane for hotfixes') if android_current_branch_is_hotfix(version_properties_path: VERSION_PROPERTIES_PATH) | ||
|
||
ensure_git_status_clean | ||
ensure_git_branch_is_release_branch! | ||
|
||
UI.important("Finalizing release: #{release_version_current}") | ||
UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?') | ||
|
||
configure_apply(force: is_ci) | ||
|
||
check_translation_progress_all unless is_ci | ||
download_translations | ||
|
||
UI.message 'Bumping final release version and build code...' | ||
VERSION_FILE.write_version( | ||
version_name: release_version_current, | ||
version_code: build_code_next | ||
) | ||
commit_version_bump | ||
|
||
# Print computed version and build to let user double-check outcome in logs | ||
version = release_version_current | ||
build_code = build_code_current | ||
UI.success("Done! Final release version: #{version}. Final build code: #{build_code}.") | ||
|
||
download_metadata_strings(version: version, build_number: build_code) | ||
|
||
UI.important('Will push changes to remote and trigger the release build.') | ||
UI.user_error!("Terminating as requested. Don't forget to run the remainder of this automation manually.") unless skip_confirm || UI.confirm('Do you want to continue?') | ||
|
||
push_to_git_remote(tags: false) | ||
|
||
build_and_upload_release(create_release: true) | ||
|
||
create_release_backmerge_pr(version_to_merge: version, next_version: release_version_next) | ||
|
||
remove_branch_protection( | ||
repository: GITHUB_REPO, | ||
branch: release_branch_name | ||
) | ||
|
||
begin | ||
set_milestone_frozen_marker( | ||
repository: GITHUB_REPO, | ||
milestone: version, | ||
freeze: false | ||
) | ||
close_milestone( | ||
repository: GITHUB_REPO, | ||
milestone: version | ||
) | ||
rescue StandardError => e | ||
report_milestone_error(error_title: "Error in milestone finalization process for `#{version}`: #{e.message}") | ||
end | ||
end | ||
|
||
desc 'Build a Prototype Build and make it available for download' | ||
lane :build_and_upload_prototype_build do | ||
UI.user_error!("'BUILDKITE_ARTIFACTS_S3_BUCKET' must be defined as an environment variable.") unless ENV['BUILDKITE_ARTIFACTS_S3_BUCKET'] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I plan to followup with a dedicated PR that surfaces
RELEASE_VERSION
here and remove reading it from the environment in the script.I think by doing that we might also make the script more portable and possibly move it to the CI plugin. Being such a simple script, I wonder what's the value, but then again, it would make the implementation, the error handling, and the messages it print consistent across project, which I think is desirable for us.
It would also make the implementation consistent with the recent changes accessing
RELEASE_VERSION
in the pipelinecommand
that we made in some iOS projects.