Skip to content

Commit 17f111d

Browse files
iangmaiawpmobilebotmokagio
authored
[Tooling] Use bot for release management git operations (#23697)
* Update pipelines to use `use-bot-for-git` script for running git operations with write access * [TO REVERT] Comment out side effects to `code_freeze` lane, keeping only version bump * Bump version number * Revert "[TO REVERT] Comment out side effects to `code_freeze` lane, keeping only version bump" This reverts commit 3580a52. * Revert "Bump version number" This reverts commit 5ae6bfd. * Remove specific simulators * Apply suggestions from code review Co-authored-by: Gio Lodi <[email protected]> * Add comment to configure-for-release.sh explaining the separate flags * Use `use-bot-for-git` directly The `use-bot-for-git` script in the mac agents will now setup the bot Git user, so doing that isn't necessary anymore --------- Co-authored-by: Automattic Release Bot <[email protected]> Co-authored-by: Gio Lodi <[email protected]>
1 parent d44c1a1 commit 17f111d

15 files changed

+88
-66
lines changed

.buildkite/commands/complete-code-freeze.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if [[ -z "${RELEASE_NUMBER}" ]]; then
77
exit 1
88
fi
99

10-
echo '--- :git: Configure Git for release management'
11-
.buildkite/commands/configure-git-for-release-management.sh
10+
echo '--- :robot_face: Use bot for Git operations'
11+
source use-bot-for-git
1212

1313
echo '--- :git: Checkout release branch'
1414
.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"

.buildkite/commands/configure-git-for-release-management.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

.buildkite/commands/finalize-hotfix.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if [[ -z "${RELEASE_NUMBER}" ]]; then
77
exit 1
88
fi
99

10-
echo '--- :git: Configure Git for release management'
11-
.buildkite/commands/configure-git-for-release-management.sh
10+
echo '--- :robot_face: Use bot for Git operations'
11+
source use-bot-for-git
1212

1313
echo '--- :git: Checkout release branch'
1414
.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"

.buildkite/commands/finalize-release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ if [[ -z "${RELEASE_NUMBER}" ]]; then
77
exit 1
88
fi
99

10-
echo '--- :git: Configure Git for release management'
11-
.buildkite/commands/configure-git-for-release-management.sh
10+
echo '--- :robot_face: Use bot for Git operations'
11+
source use-bot-for-git
1212

1313
echo '--- :git: Checkout release branch'
1414
.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"

.buildkite/commands/log-outdated-pods.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ if [[ -z "${RELEASE_NUMBER}" ]]; then
77
exit 1
88
fi
99

10+
echo '--- :robot_face: Use bot for Git operations'
11+
source use-bot-for-git
12+
1013
echo '--- :git: Checkout release branch'
11-
.buildkite/commands/configure-git-for-release-management.sh
1214
.buildkite/commands/checkout-release-branch.sh "$RELEASE_NUMBER"
1315

1416
echo '--- :ruby: Setup Ruby tools'

.buildkite/pipeline.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ steps:
6868
- group: "🔬 UI Tests"
6969
steps:
7070
- label: "🔬 :jetpack: UI Tests (iPhone)"
71-
command: .buildkite/commands/run-ui-tests.sh 'iPhone 16 (18.0)'
71+
command: .buildkite/commands/run-ui-tests.sh 'iPhone 16'
7272
depends_on: "build_jetpack"
7373
plugins: [$CI_TOOLKIT_PLUGIN]
7474
artifact_paths:
@@ -79,7 +79,7 @@ steps:
7979
context: "UI Tests (iPhone)"
8080

8181
- label: "🔬 :jetpack: UI Tests (iPad)"
82-
command: .buildkite/commands/run-ui-tests.sh 'iPad (10th generation) (18.0)'
82+
command: .buildkite/commands/run-ui-tests.sh 'iPad (10th generation)'
8383
depends_on: "build_jetpack"
8484
plugins: [$CI_TOOLKIT_PLUGIN]
8585
artifact_paths:

.buildkite/release-pipelines/code-freeze.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
4+
env:
5+
IMAGE_ID: $IMAGE_ID
6+
7+
agents:
8+
queue: mac
9+
110
steps:
211
- label: Code Freeze
312
plugins:
413
- $CI_TOOLKIT_PLUGIN
5-
# The first client to implement releases in CI was Android so the automation works in that queue.
6-
# We might want to move it to a leaner one in the future.
7-
agents:
8-
queue: android
914
command: |
10-
echo '--- :git: Configure Git for release management'
11-
.buildkite/commands/configure-git-for-release-management.sh
15+
echo '--- :robot_face: Use bot for Git operations'
16+
source use-bot-for-git
1217
1318
echo '--- :ruby: Setup Ruby tools'
1419
install_gems

.buildkite/release-pipelines/complete-code-freeze.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
14
env:
25
IMAGE_ID: $IMAGE_ID
36

47
# The code freeze completion needs to run on macOS because it uses genstrings under the hood
58
agents:
6-
queue: mac
9+
queue: mac
710

811
steps:
912
- label: Complete Code Freeze

.buildkite/release-pipelines/finalize-hotfix.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
4+
env:
5+
IMAGE_ID: $IMAGE_ID
6+
7+
# The finalization needs to run on macOS because of localization linting
8+
agents:
9+
queue: mac
10+
111
steps:
2-
- label: Finalize Release
12+
- label: Finalize Hotfix
313
plugins:
414
- $CI_TOOLKIT_PLUGIN
5-
# The finalization needs to run on macOS because of localization linting
6-
agents:
7-
queue: mac
8-
env:
9-
IMAGE_ID: $IMAGE_ID
1015
command: .buildkite/commands/finalize-hotfix.sh $VERSION
1116
retry:
1217
manual:

.buildkite/release-pipelines/finalize-release.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
1+
# yaml-language-server: $schema=https://raw.githubusercontent.com/buildkite/pipeline-schema/main/schema.json
2+
---
3+
4+
env:
5+
IMAGE_ID: $IMAGE_ID
6+
7+
# The finalization needs to run on macOS because of localization linting
8+
agents:
9+
queue: mac
10+
111
steps:
212
- label: Finalize Release
313
plugins:
414
- $CI_TOOLKIT_PLUGIN
5-
# The finalization needs to run on macOS because of localization linting
6-
agents:
7-
queue: mac
8-
env:
9-
IMAGE_ID: $IMAGE_ID
1015
command: .buildkite/commands/finalize-release.sh $RELEASE_VERSION
1116
retry:
1217
manual:

0 commit comments

Comments
 (0)