Skip to content

Use checkout_release_branch from a8c-ci-toolkit #4472

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

Merged
mokagio merged 4 commits into from
Aug 10, 2026
Merged

Use checkout_release_branch from a8c-ci-toolkit #4472

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0698ed3
Use checkout_release_branch from a8c-ci-toolkit
AliSoftware Aug 6, 2026
977fd2b
🚧 [TO REVERT] Smoke-test a8c-ci-toolkit inside a Docker step
AliSoftware Aug 7, 2026
dfcd3d5
Revert "🚧 [TO REVERT] Smoke-test a8c-ci-toolkit inside a Docker step"
AliSoftware Aug 7, 2026
8e1b46f
Merge branch 'trunk' into ainfra-2828-use-toolkit-checkout-release-br…
mokagio Aug 10, 2026
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
38 changes: 0 additions & 38 deletions .buildkite/commands/checkout-release-branch.sh
View file
Open in desktop

This file was deleted.

18 changes: 14 additions & 4 deletions .buildkite/release-build-and-distribute.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ steps:
agents:
queue: mac
command: |
.buildkite/commands/checkout-release-branch.sh "${RELEASE_VERSION}"
checkout_release_branch "${RELEASE_VERSION}"

.buildkite/commands/prepare-environment.sh

Expand Down Expand Up @@ -76,7 +76,7 @@ steps:
env:
SIGN_WINDOWS_BUILD: 1
command: |
bash .buildkite/commands/checkout-release-branch.sh "${RELEASE_VERSION}"
bash checkout_release_branch "${RELEASE_VERSION}"
powershell -File .buildkite/commands/build-for-windows.ps1 -BuildType release -Architecture {{matrix}}
artifact_paths:
- apps\studio\out\**\studio-setup.exe
Expand All @@ -102,10 +102,14 @@ steps:
command: |
set -eu

# The toolkit's commands are on the host's PATH, not the container's; the plugin
# directory is bind-mounted at /a8c-ci-toolkit by the `volumes` entry below.
export PATH="$$PATH:/a8c-ci-toolkit/bin"

# The container has no SSH keys / known_hosts, use anonymous HTTPS
git remote set-url origin https://github.com/Automattic/studio.git

bash .buildkite/commands/checkout-release-branch.sh "${RELEASE_VERSION}"
checkout_release_branch "${RELEASE_VERSION}"

apt-get -o Acquire::Retries=3 update
apt-get install -y --no-install-recommends fakeroot
Expand All @@ -127,10 +131,16 @@ steps:
# Same Docker-on-default-queue pattern as the dev Linux build group
# (see .buildkite/pipeline.yml): Amazon Linux on `default` lacks
# `dpkg`/`fakeroot`, so we build inside the Debian Node image.
# The toolkit is listed so its `environment` hook sets $A8C_CI_TOOLKIT_PLUGIN_DIR
# before the `docker` plugin resolves the volume below.
- $CI_TOOLKIT_PLUGIN
- $DOCKER_PLUGIN:
image: "$NODE_DOCKER_IMAGE"
propagate-environment: true
mount-buildkite-agent: true
expand-volume-vars: true
volumes:
- "$$A8C_CI_TOOLKIT_PLUGIN_DIR:/a8c-ci-toolkit:ro"
Comment on lines 105 to +143

@AliSoftware AliSoftware Aug 6, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

⚠️ This is the main thing that differs from other repo's implementation, and the first time we'd be testing that idea of mounting the plugin's dir inside the Docker container to access the a8c-ci-toolkit plugin from there.

I think that should work in theory, but it might be worth double-checking with some dummy test once a8c-ci-toolkit version 6.3.0 ships. For example, by creating a temporary commit that would use this trick on a dummy step that would use the docker plugin + calls a benign command provided by a8c-ci-toolkit (like hash_file) from within its container.

@AliSoftware AliSoftware Aug 7, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Validated via 977fd2b — see #4472 (comment)

matrix:
- x64
- arm64
Expand All @@ -143,7 +153,7 @@ steps:
echo "--- :robot_face: Use bot for Git operations"
source use-bot-for-git

.buildkite/commands/checkout-release-branch.sh "${RELEASE_VERSION}"
checkout_release_branch "${RELEASE_VERSION}"

echo "--- :node: Downloading Binaries"
buildkite-agent artifact download "*.zip" .
Expand Down
2 changes: 1 addition & 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,7 +11,7 @@ steps:
echo "--- :robot_face: Use bot for Git operations"
source use-bot-for-git

.buildkite/commands/checkout-release-branch.sh "${RELEASE_VERSION}"
checkout_release_branch "${RELEASE_VERSION}"

echo "--- :ruby: Setup Ruby Tools"
install_gems
Expand Down
2 changes: 1 addition & 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,7 +11,7 @@ steps:
echo "--- :robot_face: Use bot for Git operations"
source use-bot-for-git

.buildkite/commands/checkout-release-branch.sh "${RELEASE_VERSION}"
checkout_release_branch "${RELEASE_VERSION}"

echo "--- :ruby: Setup Ruby Tools"
install_gems
Expand Down
2 changes: 1 addition & 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,7 +11,7 @@ steps:
echo "--- :robot_face: Use bot for Git operations"
source use-bot-for-git

.buildkite/commands/checkout-release-branch.sh "${RELEASE_VERSION}"
checkout_release_branch "${RELEASE_VERSION}"

echo "--- :ruby: Setup Ruby Tools"
install_gems
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/shared-pipeline-vars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

# The ~> modifier is not currently used, but we check for it just in case
XCODE_VERSION=$(sed -E -n 's/^(~> )?(.*)/xcode-\2/p' .xcode-version)
CI_TOOLKIT_VERSION='6.1.1'
CI_TOOLKIT_VERSION='6.3.0'
NVM_PLUGIN_VERSION='0.6.0'
DOCKER_PLUGIN_VERSION='v5.13.0'
NODE_VERSION=$(sed 's/^v//' .nvmrc)
Expand Down