Skip to content

Use CI toolkit plugin v5 and nvm plugin v0.4.0 #998

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
merged 4 commits into from
Mar 5, 2025
Merged

Use CI toolkit plugin v5 and nvm plugin v0.4.0 #998

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
986bec3
Use nvm Buildkite plugin version 0.4.0 — Better logs
mokagio Feb 25, 2025
b5f4c17
Upgrade CI toolkit to version 5 - Removes custom Windows automation
mokagio Mar 3, 2025
b2d5565
Set `IS_DEV_BUILD` via pipeline `env` node
mokagio Mar 3, 2025
cef5028
Add note about running command defined in CI toolkit plugin
mokagio Mar 3, 2025
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
2 changes: 1 addition & 1 deletion .buildkite/commands/build-for-windows-dev.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Stop script execution when a non-terminating error occurs
$ErrorActionPreference = "Stop"

& "$PSScriptRoot\prepare-windows-host.ps1"
& "prepare_windows_host_for_app_distribution.ps1" # via CI toolkit plugin

Write-Host "--- :node: Building App"
node ./scripts/prepare-dev-build-version.mjs
Expand Down
2 changes: 1 addition & 1 deletion .buildkite/commands/build-for-windows-release.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Stop script execution when a non-terminating error occurs
$ErrorActionPreference = "Stop"

& "$PSScriptRoot\prepare-windows-host.ps1"
& "prepare_windows_host_for_app_distribution.ps1" # via CI toolkit plugin

Write-Host "--- :node: Building App"
node ./scripts/confirm-tag-matches-version.mjs
Expand Down
44 changes: 0 additions & 44 deletions .buildkite/commands/install-windows-10-sdk.ps1
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions .buildkite/commands/prepare-windows-host.ps1
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions .buildkite/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ steps:
- label: 🔨 Windows Dev Build
key: dev-windows
command: |
$env:IS_DEV_BUILD="true"
bash .buildkite/commands/install-node-dependencies.sh
.buildkite/commands/build-for-windows-dev.ps1
node scripts/package-appx.mjs
artifact_paths:
Expand All @@ -139,7 +139,9 @@ steps:
- out\**\*.appx
agents:
queue: windows
plugins: [$CI_TOOLKIT_PLUGIN]
env:
IS_DEV_BUILD: true
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure why IS_DEV_BUILD was set via $env: before and why it worked when the pipeline should have ignored the $ (see the docs).

Anyway, once I added the bash call, the resolution for the env assignment no longer worked.

Moving the env var definition in the env node seems to have done the trick. I can see in the CI logs that we have "Sentry environment: development" as per:

studio/webpack.plugins.ts

Line 10 in 98f29e1

console.log( 'Sentry environment:', isDevEnvironment ? 'development' : 'production' );

image

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for adjusting that, it seems now it's done in more practical way.

We've added that under #813 to avoid initializing Sentry during CI runs.

plugins: [$CI_TOOLKIT_PLUGIN, $NVM_PLUGIN]
if: build.tag !~ /^v[0-9]+/
notify:
- github_commit_status:
Expand Down Expand Up @@ -236,8 +238,9 @@ steps:
key: release-windows
agents:
queue: windows
plugins: [$CI_TOOLKIT_PLUGIN]
plugins: [$CI_TOOLKIT_PLUGIN, $NVM_PLUGIN]
command: |
bash .buildkite/commands/install-node-dependencies.sh
.buildkite/commands/build-for-windows-release.ps1
node scripts/package-appx.mjs
artifact_paths:
Expand Down
4 changes: 2 additions & 2 deletions .buildkite/shared-pipeline-vars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

# 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='3.10.0'
NVM_PLUGIN_VERSION='0.3.0'
CI_TOOLKIT_VERSION='5.0.0'
NVM_PLUGIN_VERSION='0.4.0'

export IMAGE_ID="$XCODE_VERSION"
export CI_TOOLKIT_PLUGIN="automattic/a8c-ci-toolkit#$CI_TOOLKIT_VERSION"
Expand Down
Loading