Skip to content
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.

Sign up for GitHub

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

[Tooling] Use bot for release management git operations #14207

Merged
merged 7 commits into from
Nov 4, 2024
Merged

[Tooling] Use bot for release management git operations #14207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa6cda4
Update pipelines to use `use-bot-for-git` script for running git oper…
iangmaia Oct 24, 2024
b1e8f06
Use `use-bot-for-git` directly
iangmaia Oct 25, 2024
f965466
[TO REVERT] Comment out side effects to `start_code_freeze` lane, kee…
iangmaia Oct 24, 2024
72697b2
Revert "[TO REVERT] Comment out side effects to `start_code_freeze` l…
iangmaia Oct 25, 2024
ff59fa0
Revert "Bump version number"
iangmaia Oct 25, 2024
847120e
Remove specific simulator versions given 16.1 doesn't require them
iangmaia Oct 28, 2024
8731800
Apply suggestions from code review
iangmaia Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions .buildkite/commands/configure-environment.sh
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .buildkite/commands/configure-git-for-release-management.sh
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ steps:
# UI Tests
#################
- label: ":microscope: UI Tests (iPhone)"
command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 16 (18.1)'
command: .buildkite/commands/run-ui-tests.sh UITests 'iPhone 16'
depends_on: build
plugins: [$CI_TOOLKIT]
artifact_paths:
Expand All @@ -102,7 +102,7 @@ steps:
context: UI Tests (iPhone)

- label: ":microscope: UI Tests (iPad)"
command: .buildkite/commands/run-ui-tests.sh UITests "iPad (10th generation) (18.1)"
command: .buildkite/commands/run-ui-tests.sh UITests "iPad (10th generation)"
depends_on: build
plugins: [$CI_TOOLKIT]
artifact_paths:
Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/complete-code-freeze.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ steps:
- label: Complete Code Freeze
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :git: Checkout Release Branch'
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"

echo '--- :ruby: Setup Ruby Tools'
install_gems
Comment on lines 17 to +21
Copy link
Contributor

Choose a reason for hiding this comment

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

By the way, I think this is the best approach to run bundle install. That is, we should always run it after checking out the release branch. Otherwise, we might run into the edge case of having the branch that triggered the build using a gemset different from the release branch which could lead to gnarly issues.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

🎯

This is something I noticed in a lot of pipelines across our repos, that install_gems was running before checking out the new branch, so I've changed it with the use-bot-for-git change.


echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply

Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/finalize-hotfix-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ steps:
- label: Finalize Hotfix Release
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :git: Checkout Release Branch'
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"

echo '--- :ruby: Setup Ruby Tools'
install_gems

echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply

Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/finalize-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ steps:
- label: Finalize Release
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :git: Checkout Release Branch'
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"

echo '--- :ruby: Setup Ruby Tools'
install_gems

echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply

Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/new-beta-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ steps:
- label: New Beta Release
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :git: Checkout Release Branch'
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"

echo '--- :ruby: Setup Ruby Tools'
install_gems

echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply

Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/new-hotfix-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ steps:
- label: New Hotfix Release
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :ruby: Setup Ruby Tools'
install_gems

echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply
Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/publish-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ steps:
- label: Publish Release
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :git: Checkout Release Branch'
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"

echo '--- :ruby: Setup Ruby Tools'
install_gems

echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply

Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/start-code-freeze.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ steps:
- label: Start Code Freeze
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :ruby: Setup Ruby Tools'
install_gems

echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply
Expand Down
6 changes: 5 additions & 1 deletion .buildkite/release-pipelines/update-metadata-on-app-store-connect.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@ steps:
- label: Update Metadata on App Store Connect
plugins: [$CI_TOOLKIT]
command: |
.buildkite/commands/configure-environment.sh
echo '--- :robot_face: Use bot for Git operations'
source use-bot-for-git

echo '--- :git: Checkout Release Branch'
.buildkite/commands/checkout-release-branch.sh "$RELEASE_VERSION"

echo '--- :ruby: Setup Ruby Tools'
install_gems

echo '--- :closed_lock_with_key: Access Secrets'
bundle exec fastlane run configure_apply

Expand Down
4 changes: 2 additions & 2 deletions config/Version.Public.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CURRENT_PROJECT_VERSION = $VERSION_LONG
MARKETING_VERSION = $VERSION_SHORT
VERSION_LONG = 21.0.0.0
VERSION_SHORT = 21.0
VERSION_LONG = 20.9.0.0
VERSION_SHORT = 20.9