From cdef5fc491cae2f706cdb81a556ec5c4df2ade4f Mon Sep 17 00:00:00 2001 From: rldyourmnd Date: Thu, 3 Sep 2026 20:03:42 +0500 Subject: [PATCH] fix(images): restore private Bun contract --- config/golden-image-container-integration.yaml | 8 ++++---- config/golden-image-container.yaml | 8 ++++---- config/golden-image-integration.yaml | 8 ++++---- config/golden-image.yaml | 8 ++++---- internal/garmbootstrap/types.go | 10 +++++----- internal/imagebuild/orchestrator_test.go | 2 +- internal/imagemanifest/manifest_test.go | 4 ++-- scripts/install-benchmark-toolchain.sh | 8 ++++---- 8 files changed, 28 insertions(+), 28 deletions(-) diff --git a/config/golden-image-container-integration.yaml b/config/golden-image-container-integration.yaml index bba3282d..14d9ac87 100644 --- a/config/golden-image-container-integration.yaml +++ b/config/golden-image-container-integration.yaml @@ -2,7 +2,7 @@ schema_version: 1 image: type: container - alias: nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b18 + alias: nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b19 current_alias: nddev-ubuntu-24.04-amd64-container-docker-current previous_alias: nddev-ubuntu-24.04-amd64-container-docker-previous source_alias: nddev-source-ubuntu-24.04-amd64-container-r20260801 @@ -49,10 +49,10 @@ go_cache_seed: toolchains: - name: bun - version: 1.4.0 + version: 1.3.14 archive: bun-linux-x64.zip - download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.4.0/bun-linux-x64.zip - archive_sha256: 2d03fb5fb83ac8b567aca0a281b2ce1a1a19d488f56c2968d88c3f25e92fe452 + download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.3.14/bun-linux-x64.zip + archive_sha256: 951ee2aee855f08595aeec6225226a298d3fea83a3dcd6465c09cbccdf7e848f - name: codeql version: 2.26.4 archive: codeql-bundle-linux64.tar.gz diff --git a/config/golden-image-container.yaml b/config/golden-image-container.yaml index 9f8f065a..20470e9a 100644 --- a/config/golden-image-container.yaml +++ b/config/golden-image-container.yaml @@ -2,7 +2,7 @@ schema_version: 1 image: type: container - alias: nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b24 + alias: nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b25 current_alias: nddev-ubuntu-24.04-amd64-container-current previous_alias: nddev-ubuntu-24.04-amd64-container-previous source_alias: nddev-source-ubuntu-24.04-amd64-container-r20260801 @@ -49,10 +49,10 @@ go_cache_seed: toolchains: - name: bun - version: 1.4.0 + version: 1.3.14 archive: bun-linux-x64.zip - download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.4.0/bun-linux-x64.zip - archive_sha256: 2d03fb5fb83ac8b567aca0a281b2ce1a1a19d488f56c2968d88c3f25e92fe452 + download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.3.14/bun-linux-x64.zip + archive_sha256: 951ee2aee855f08595aeec6225226a298d3fea83a3dcd6465c09cbccdf7e848f - name: codeql version: 2.26.4 archive: codeql-bundle-linux64.tar.gz diff --git a/config/golden-image-integration.yaml b/config/golden-image-integration.yaml index 93b5fc8c..b5da2b2a 100644 --- a/config/golden-image-integration.yaml +++ b/config/golden-image-integration.yaml @@ -1,7 +1,7 @@ schema_version: 1 image: - alias: nddev-ubuntu-24.04-amd64-docker-runner-2.336.0-r20260801-b19 + alias: nddev-ubuntu-24.04-amd64-docker-runner-2.336.0-r20260801-b20 current_alias: nddev-ubuntu-24.04-amd64-docker-current previous_alias: nddev-ubuntu-24.04-amd64-docker-previous source_alias: nddev-source-ubuntu-24.04-amd64-r20260801 @@ -48,10 +48,10 @@ go_cache_seed: toolchains: - name: bun - version: 1.4.0 + version: 1.3.14 archive: bun-linux-x64.zip - download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.4.0/bun-linux-x64.zip - archive_sha256: 2d03fb5fb83ac8b567aca0a281b2ce1a1a19d488f56c2968d88c3f25e92fe452 + download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.3.14/bun-linux-x64.zip + archive_sha256: 951ee2aee855f08595aeec6225226a298d3fea83a3dcd6465c09cbccdf7e848f - name: codeql version: 2.26.4 archive: codeql-bundle-linux64.tar.gz diff --git a/config/golden-image.yaml b/config/golden-image.yaml index 83554192..12dde2fe 100644 --- a/config/golden-image.yaml +++ b/config/golden-image.yaml @@ -1,7 +1,7 @@ schema_version: 1 image: - alias: nddev-ubuntu-24.04-amd64-runner-2.336.0-r20260801-b20 + alias: nddev-ubuntu-24.04-amd64-runner-2.336.0-r20260801-b21 current_alias: nddev-ubuntu-24.04-amd64-current previous_alias: nddev-ubuntu-24.04-amd64-previous source_alias: nddev-source-ubuntu-24.04-amd64-r20260801 @@ -48,10 +48,10 @@ go_cache_seed: toolchains: - name: bun - version: 1.4.0 + version: 1.3.14 archive: bun-linux-x64.zip - download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.4.0/bun-linux-x64.zip - archive_sha256: 2d03fb5fb83ac8b567aca0a281b2ce1a1a19d488f56c2968d88c3f25e92fe452 + download_url: https://github.com/oven-sh/bun/releases/download/bun-v1.3.14/bun-linux-x64.zip + archive_sha256: 951ee2aee855f08595aeec6225226a298d3fea83a3dcd6465c09cbccdf7e848f - name: codeql version: 2.26.4 archive: codeql-bundle-linux64.tar.gz diff --git a/internal/garmbootstrap/types.go b/internal/garmbootstrap/types.go index a28800c6..908d9613 100644 --- a/internal/garmbootstrap/types.go +++ b/internal/garmbootstrap/types.go @@ -36,17 +36,17 @@ const ( DefaultPoolBalancerType = "roundrobin" DefaultProviderName = "nddev-incus" DefaultImage = "nddev-ubuntu-24.04-amd64-container-current" - IntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b18" - PriorityStandardImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b24" - PriorityIntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b18" + IntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b19" + PriorityStandardImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b25" + PriorityIntegrationImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b19" // Every Linux class is an ephemeral Incus container. Docker-capable classes // use their nested-runtime image; release uses a separately stage-smoked // standard image so OIDC authority does not inherit Docker/nesting. FastImage = ContainerCanaryImage UntrustedImage = IntegrationImage - ReleaseImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b24" + ReleaseImage = "nddev-ubuntu-24.04-amd64-container-runner-2.336.0-r20260801-b25" ContainerCanaryImage = "nddev-ubuntu-24.04-amd64-container-current" - DockerContainerCanaryImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b18" + DockerContainerCanaryImage = "nddev-u24-amd64-ctr-docker-runner-2.336.0-r20260801-b19" DefaultFlavor = "nddev-linux-standard" IntegrationFlavor = "nddev-linux-integration" FastFlavor = "nddev-linux-fast" diff --git a/internal/imagebuild/orchestrator_test.go b/internal/imagebuild/orchestrator_test.go index 31bcf550..7af58090 100644 --- a/internal/imagebuild/orchestrator_test.go +++ b/internal/imagebuild/orchestrator_test.go @@ -165,7 +165,7 @@ func TestRecipeFingerprintIsDeterministic(t *testing.T) { // coupling is the point: the alias is part of the recipe, so a manifest // whose contents changed under an unchanged alias would otherwise ask the // builder to produce different bytes for a name that is already promoted. - if first != "sha256:1398675d254c1a054a25e88d7a0fe50271fb48191adcf1ed8e39a73c24c58e22" { + if first != "sha256:3ca60ebd286bb7be8c1e2449d18e705d65a9ff4d3e4478c60e6416f3807c4498" { t.Fatalf("deployed standard recipe fingerprint drifted: %q", first) } smoke, err := SmokeFingerprint(plan) diff --git a/internal/imagemanifest/manifest_test.go b/internal/imagemanifest/manifest_test.go index f72c2b0e..78e8ba7d 100644 --- a/internal/imagemanifest/manifest_test.go +++ b/internal/imagemanifest/manifest_test.go @@ -42,7 +42,7 @@ func TestRepositoryManifestIsValidAndPinned(t *testing.T) { if !strings.HasPrefix(fingerprint, "sha256:") || len(fingerprint) != len("sha256:")+64 { t.Fatalf("unexpected fingerprint %q", fingerprint) } - if fingerprint != "sha256:155753285612c6a7ae6525cd8875ca22031c4f7b7e4f067837b07f77ea9beadf" { + if fingerprint != "sha256:7a69a79e9ab4e8e99b4dd94d3507d829d1e092927d7a64063ff893d3b7686afb" { t.Fatalf("standard manifest fingerprint drifted: %q", fingerprint) } } @@ -70,7 +70,7 @@ func TestContainerManifestPinsCanonicalSignedRootfs(t *testing.T) { func assertBakedToolchains(t *testing.T, manifest Manifest) { t.Helper() wanted := map[string]struct{ version, archiveSHA256 string }{ - "bun": {"1.4.0", "2d03fb5fb83ac8b567aca0a281b2ce1a1a19d488f56c2968d88c3f25e92fe452"}, + "bun": {"1.3.14", "951ee2aee855f08595aeec6225226a298d3fea83a3dcd6465c09cbccdf7e848f"}, "codeql": {"2.26.4", "48e1ab8b874d57bd6fd7c90fefee75addc5a45e9bd063982df9beb45a62dd5d3"}, "gh": {"2.97.0", "a2c9b8497e1f85b1ad0dfcb78b5a622e098801b8e461e459e88e1ee12f018112"}, "go": {"1.26.7", "ffb5f8de10c62550dfddab66b36b57030721e0a44a3218e9e1181d7b59f121ca"}, diff --git a/scripts/install-benchmark-toolchain.sh b/scripts/install-benchmark-toolchain.sh index 826637eb..b3e6aac5 100755 --- a/scripts/install-benchmark-toolchain.sh +++ b/scripts/install-benchmark-toolchain.sh @@ -109,18 +109,18 @@ case "${toolchain}" in [[ "$(uv --version)" == "uv 0.11.30"* ]] ;; bun) - if [[ "$(bun --version 2>/dev/null || true)" == "1.4.0" ]]; then + if [[ "$(bun --version 2>/dev/null || true)" == "1.3.14" ]]; then exit 0 fi archive="${scratch}/bun.zip" download_verified \ - "https://github.com/oven-sh/bun/releases/download/bun-v1.4.0/bun-linux-x64.zip" \ - "2d03fb5fb83ac8b567aca0a281b2ce1a1a19d488f56c2968d88c3f25e92fe452" \ + "https://github.com/oven-sh/bun/releases/download/bun-v1.3.14/bun-linux-x64.zip" \ + "951ee2aee855f08595aeec6225226a298d3fea83a3dcd6465c09cbccdf7e848f" \ "${archive}" unzip -q "${archive}" -d "${scratch}" install -m 0755 "${scratch}/bun-linux-x64/bun" "${binary_root}/bun" printf '%s\n' "${binary_root}" >>"${GITHUB_PATH}" export PATH="${binary_root}:${PATH}" - [[ "$(bun --version)" == "1.4.0" ]] + [[ "$(bun --version)" == "1.3.14" ]] ;; esac