Skip to content

ci: run workflows on Blacksmith runners (backport to release/v0.9.x) - #2713

Closed
Charlesthebird wants to merge 2 commits into
release/v0.9.xfrom
charlesthebird/mergeQueue-v0.9.x
Closed

ci: run workflows on Blacksmith runners (backport to release/v0.9.x)#2713
Charlesthebird wants to merge 2 commits into
release/v0.9.xfrom
charlesthebird/mergeQueue-v0.9.x

Conversation

@Charlesthebird

@Charlesthebird Charlesthebird commented Sep 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

🤖 written by Claude (start)

Release note

NONE

Changes

Backport of #2659 and #2723: CI, image scan and tag builds run on Blacksmith runners with its Docker builder.

🤖 written by Claude (end)

@Charlesthebird Charlesthebird mentioned this pull request Sep 4, 2026
Merged
@Charlesthebird
Charlesthebird marked this pull request as ready for review September 4, 2026 21:27
EItanya added a commit that referenced this pull request Sep 7, 2026
@Charlesthebird @EItanya
ci: support merge queues (#2711)
bc02077 
---
*🤖 written by Claude (start)*

## Release note

```release-note
NONE
```

## Changes

- CI checks now run on the `merge_group` event, so a merge queue can use
them.
- The migration check and upgrade tests learn the base branch from the
merge group, since `github.base_ref` is empty there.
- Merge queue runs share one Docker build cache instead of creating a
new one each time.

## Backports

- #2712 to `release/v0.10.x`
- #2713 to `release/v0.9.x`

---
*🤖 written by Claude (end)*

---------

Signed-off-by: Nicholas Bucher <[email protected]>
Co-authored-by: Eitan Yarmush <[email protected]>
blacksmith-sh Bot and others added 2 commits September 8, 2026 11:55
@blacksmith-sh @Charlesthebird
.github/workflows: Migrate workflows to Blacksmith runners (#2659)
f8023c8 
This PR has been automatically generated by a team member in your GitHub
organization using Blacksmith's [Migration
Wizard](https://docs.blacksmith.sh/introduction/quickstart). This PR
changes the following:

1. Your selected workflows will now run on Blacksmith's 2x faster
hardware (e.g., `runs-on: blacksmith-4vcpu-ubuntu-2204`). Learn more
about the [different instances available to choose
from](https://docs.blacksmith.sh/blacksmith-runners/overview#runner-tags).
2. Your jobs running on Blacksmith will now have all official GitHub and
popular third-party cache actions automatically interact with our 4x
faster, colocated cache. Learn more about [Blacksmith's actions
cache](https://docs.blacksmith.sh/blacksmith-caching/dependencies-actions).
3. Your GitHub Actions will now actually be observable. Learn more about
Blacksmith's
[logging](https://docs.blacksmith.sh/blacksmith-observability/logs) and
other
[observability](https://docs.blacksmith.sh/blacksmith-observability/dashboard)
features.
4. Your Docker builds will now automatically share their Docker layer
cache, resulting in up to 40x faster builds. Learn more about
[Blacksmith's Docker layer
caching](https://docs.blacksmith.sh/blacksmith-caching/docker-builds).

<!-- codesmith:footer -->
---
<a
href="https://app.blacksmith.sh/kagent-dev/codesmith/kagent/pr/2659"><picture><source
media="(prefers-color-scheme: dark)"
srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"><source
media="(prefers-color-scheme: light)"
srcset="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-light-v2.svg"><img
alt="View with [code]smith"
src="https://pr-comments-assets.blacksmith.sh/codesmith/view-with-codesmith-dark-v2.svg"></picture></a>
<sup>Need help on this PR? Tag <code>@codesmith-bot</code> with what you
need. Autofix is enabled.</sup>

<!-- codesmith:autofix:enabled -->
<!-- /codesmith:footer -->

---------

Signed-off-by: Eitan Yarmush <[email protected]>
Co-authored-by: blacksmith-sh[bot] <157653362+blacksmith-sh[bot]@users.noreply.github.com>
Co-authored-by: Eitan Yarmush <[email protected]>
(cherry picked from commit 50c856b)

Signed-off-by: Nicholas Bucher <[email protected]>
@dependabot @Charlesthebird
chore(deps): bump useblacksmith/setup-docker-builder from 1 to 2 (#2723)
fa56825 
Bumps
[useblacksmith/setup-docker-builder](https://github.com/useblacksmith/setup-docker-builder)
from 1 to 2.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/useblacksmith/setup-docker-builder/releases">useblacksmith/setup-docker-builder's
releases</a>.</em></p>
<blockquote>
<h2>v2.0.0</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Other Changes</h3>
<ul>
<li>feat: add required cache-key input, native GC, and server-driven
config for v2 by <a
href="https://github.com/piob-io"><code>@​piob-io</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/108">useblacksmith/setup-docker-builder#108</a></li>
<li>ci: add cache-key to test workflows for v2 compatibility by <a
href="https://github.com/piob-io"><code>@​piob-io</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/110">useblacksmith/setup-docker-builder#110</a></li>
<li>improve observability and readiness timeout for buildkitd startup
(v2) by <a
href="https://github.com/ajwerner"><code>@​ajwerner</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/113">useblacksmith/setup-docker-builder#113</a></li>
<li>remove bbolt integrity check entirely (release/v2) by <a
href="https://github.com/Trent-TSE"><code>@​Trent-TSE</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/116">useblacksmith/setup-docker-builder#116</a></li>
<li>setup_builder: wait for non-zero device size before formatting
sticky disk (release/v2) by <a
href="https://github.com/piob-io"><code>@​piob-io</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/119">useblacksmith/setup-docker-builder#119</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/Trent-TSE"><code>@​Trent-TSE</code></a>
made their first contribution in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/116">useblacksmith/setup-docker-builder#116</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/useblacksmith/setup-docker-builder/compare/v1.11.0...v2.0.0">https://github.com/useblacksmith/setup-docker-builder/compare/v1.11.0...v2.0.0</a></p>
<h2>v1.12.0</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Other Changes</h3>
<ul>
<li>improve observability and readiness timeout for buildkitd startup by
<a href="https://github.com/ajwerner"><code>@​ajwerner</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/112">useblacksmith/setup-docker-builder#112</a></li>
<li>setup_builder: wait for non-zero device size before formatting
sticky disk by <a
href="https://github.com/piob-io"><code>@​piob-io</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/118">useblacksmith/setup-docker-builder#118</a></li>
<li>docs: document v2 action API alongside v1 in README by <a
href="https://github.com/piob-io"><code>@​piob-io</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/120">useblacksmith/setup-docker-builder#120</a></li>
<li>mount sticky disk with noinit_itable to stop repeated lazy-init
writes by <a
href="https://github.com/piob-io"><code>@​piob-io</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/123">useblacksmith/setup-docker-builder#123</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/useblacksmith/setup-docker-builder/compare/v2.0.1...v1.12.0">https://github.com/useblacksmith/setup-docker-builder/compare/v2.0.1...v1.12.0</a></p>
<h2>v1.11.0</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Other Changes</h3>
<ul>
<li>setup_builder: wait for non-zero device size before formatting
sticky disk by <a
href="https://github.com/piob-io"><code>@​piob-io</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/118">useblacksmith/setup-docker-builder#118</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/useblacksmith/setup-docker-builder/compare/v1.10.0...v1.11.0">https://github.com/useblacksmith/setup-docker-builder/compare/v1.10.0...v1.11.0</a></p>
<h2>v1.10.0</h2>
<!-- raw HTML omitted -->
<h2>What's Changed</h2>
<h3>Other Changes</h3>
<ul>
<li>improve observability and readiness timeout for buildkitd startup by
<a href="https://github.com/ajwerner"><code>@​ajwerner</code></a> in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/112">useblacksmith/setup-docker-builder#112</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/ajwerner"><code>@​ajwerner</code></a>
made their first contribution in <a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/pull/112">useblacksmith/setup-docker-builder#112</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/useblacksmith/setup-docker-builder/compare/v1.9.0...v1.10.0">https://github.com/useblacksmith/setup-docker-builder/compare/v1.9.0...v1.10.0</a></p>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/19215110ab936351210feebdfa5b440b4493e184"><code>1921511</code></a>
build-telemetry: finalize pending history traces, raise the job-wide
payload ...</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/e20544eb8086731c00f796c3b9be435a6a92c72f"><code>e20544e</code></a>
export buildkit history and structured lifecycle telemetry at teardown
(relea...</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/fabc8a36cc1e0f3a8f0d21a1aa43ee06c151c645"><code>fabc8a3</code></a>
setup_builder: take the buildkitd GC keepDuration from the sticky disk
respon...</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/db5a1b6246dd8ae64849962a2ed8490379205901"><code>db5a1b6</code></a>
Surface early sticky disk commit denial and stop logging false commit
success...</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/34d8667d4fc46c4f02df90c97e801f1c4d6b1549"><code>34d8667</code></a>
post-step: keep committing the sticky disk when buildkitd is already
gone; di...</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/a5256a73e30f09e37e3eceb8ca36043d17621d24"><code>a5256a7</code></a>
mount sticky disk with noinit_itable to stop repeated lazy-init writes
(<a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/issues/124">#124</a>)</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/4684ce0e4fee283b1d900309fafdd1b6e27a8e72"><code>4684ce0</code></a>
Discover the Blacksmith agent via BLACKSMITH_AGENT_ADDR and fall back to
the ...</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/1e75355f81cbb3f93cba1eb5dd5e5b05110ca8f9"><code>1e75355</code></a>
fix: don't report user input errors to the Blacksmith backend (<a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/issues/121">#121</a>)</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/33803e640bd9d674f2843a8c323aa2a7da478d23"><code>33803e6</code></a>
setup_builder: wait for non-zero device size before formatting sticky
disk (#...</li>
<li><a
href="https://github.com/useblacksmith/setup-docker-builder/commit/7a99e9f36ef3283dc8ef58f672a78ad36e153c9e"><code>7a99e9f</code></a>
remove bbolt integrity check entirely (release/v2) (<a
href="https://redirect.github.com/useblacksmith/setup-docker-builder/issues/116">#116</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/useblacksmith/setup-docker-builder/compare/v1...v2">compare
view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=useblacksmith/setup-docker-builder&package-manager=github_actions&previous-version=1&new-version=2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)

</details>

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit f46149f)

Signed-off-by: Nicholas Bucher <[email protected]>
@Charlesthebird
Charlesthebird force-pushed the charlesthebird/mergeQueue-v0.9.x branch from 021089b to fa56825 Compare September 8, 2026 15:56
@Charlesthebird Charlesthebird changed the title ci: support merge queues (backport to release/v0.9.x) ci: run workflows on Blacksmith runners (backport to release/v0.9.x) Sep 8, 2026
Charlesthebird
Charlesthebird commented Sep 8, 2026
View reviewed changes

@Charlesthebird Charlesthebird left a comment

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

This automated review is a first pass. A manual review will follow once the blockers are addressed.

Nothing blocks merge. The two commits are cherry-picks of #2659 and #2723, with conflicts resolved by keeping the release-branch side and changing only the runner label or the Buildx step.

Findings, none blocking
  • BUILDX_VERSION in ci.yaml and image-scan.yaml has no consumer once the Buildx step is gone, but main carries the same value so it stays.
  • The e2e and build jobs keep a QEMU step before the Blacksmith builder, which is what main does in its build job.
✅ What I checked
  • ✅ Diff scope: only runs-on lines and Buildx→Blacksmith step swaps across the three workflow files, with git diff --check clean.
  • ✅ Every job's runner label equals main's for the same-named job, and jobs main leaves on ubuntu-latest stay there.
  • ✅ useblacksmith/setup-docker-builder@v2 appears in all three places and no @v1 remains.
  • ✅ BUILDX_BUILDER_NAME is still defined at the top level and consumed by every make build step, as on main.
  • ✅ tag.yaml keeps its Buildx step with only the runner changed, matching main.
  • ✅ Builds still reach the registry:2 service because make build-* runs buildx-create, which recreates the network=host builder from a Makefile target identical to main's.
  • ✅ git log 50c856b6..origin/main -- .github shows no Blacksmith follow-up other than #2723, which is included.
  • ✅ All three files parse as YAML.

🤖 written by Claude

@Charlesthebird
Charlesthebird deleted the charlesthebird/mergeQueue-v0.9.x branch September 8, 2026 16:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@Charlesthebird