From ac5638ec84f2ca6f9cfbd25e543703e59e4e0bb1 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Fri, 19 Sep 2025 20:48:51 +0100 Subject: [PATCH 01/14] chore: bump bake --- .github/workflows/.test.yml | 11 ++++++----- .github/workflows/buildkit.yml | 19 ++++++++++--------- .github/workflows/buildx-image.yml | 4 ++-- .github/workflows/dockerd.yml | 9 +++++---- .github/workflows/frontend.yml | 7 ++++--- .github/workflows/test-os.yml | 4 ++-- .github/workflows/validate.yml | 6 +++--- hack/release | 5 +++-- 8 files changed, 35 insertions(+), 30 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 66a08ca45..957461bb4 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -28,8 +28,8 @@ on: env: GO_VERSION: "1.21" - SETUP_BUILDX_VERSION: "latest" - SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" + SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream jobs: prepare: @@ -89,7 +89,7 @@ jobs: }); - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: provenance: false targets: integration-tests-base @@ -147,7 +147,7 @@ jobs: buildkitd-flags: --debug - name: Build test image - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: provenance: false targets: integration-tests @@ -173,7 +173,8 @@ jobs: TEST_COVERAGE: 1 TESTPKGS: ${{ matrix.pkg }} SKIP_INTEGRATION_TESTS: 1 - CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }} + # TODO(jhorsts): errors with HTTP 400 + # CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }} - name: Send to Codecov if: always() diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 376aa052a..b4e5dc613 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -22,8 +22,8 @@ on: env: GO_VERSION: "1.21" - SETUP_BUILDX_VERSION: "latest" - SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" + SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream IMAGE_NAME: "moby/buildkit" PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le,linux/riscv64" DESTDIR: "./bin" @@ -125,13 +125,14 @@ jobs: env: RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }} PLATFORMS: ${{ matrix.platform }} - CACHE_FROM: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }} - CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }} + # TODO(jhorsts): replace with upstream + # CACHE_FROM: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }} + # CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }} - name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: buildkit + name: buildkit-${{ env.PLATFORM_PAIR }} path: ${{ env.DESTDIR }}/* if-no-files-found: error @@ -177,8 +178,9 @@ jobs: env: RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }} TARGET: ${{ matrix.target-stage }} - CACHE_FROM: type=gha,scope=image${{ matrix.target-stage }} - CACHE_TO: type=gha,scope=image${{ matrix.target-stage }} + # TODO(jhorsts): replace with upstream + # CACHE_FROM: type=gha,scope=image${{ matrix.target-stage }} + # CACHE_TO: type=gha,scope=image${{ matrix.target-stage }} release: runs-on: ubuntu-22.04 @@ -190,9 +192,8 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v5 # TODO(jhorsts): replace with upstream with: - name: buildkit path: ${{ env.DESTDIR }} - name: List artifacts diff --git a/.github/workflows/buildx-image.yml b/.github/workflows/buildx-image.yml index 390965323..d7220827b 100644 --- a/.github/workflows/buildx-image.yml +++ b/.github/workflows/buildx-image.yml @@ -30,8 +30,8 @@ on: default: 'true' env: - SETUP_BUILDX_VERSION: "latest" - REPO_SLUG_TARGET: "moby/buildkit" + SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream + REPO_SLUG_TARGET: "moby/buildkit" # TODO(jhorsts): replace with upstream jobs: create: diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index ed913f269..be92a3d5e 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -10,8 +10,8 @@ on: default: '23.0.1' env: - SETUP_BUILDX_VERSION: "latest" - SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" + SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream TESTFLAGS: "-v --parallel=1 --timeout=30m" jobs: @@ -109,7 +109,7 @@ jobs: buildkitd-flags: --debug - name: Download dockerd - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v5 # TODO(jhorsts): replace with upstream with: name: dockerd path: ./build/ @@ -127,7 +127,8 @@ jobs: TESTPKGS: "${{ matrix.pkg }}" TESTFLAGS: "${{ env.TESTFLAGS }} --run=//worker=${{ matrix.worker }}$" SKIP_INTEGRATION_TESTS: "${{ matrix.skip-integration-tests }}" - CACHE_FROM: "type=gha,scope=build-integration-tests" + # TODO(jhorsts): replace with upstream + # CACHE_FROM: "type=gha,scope=build-integration-tests" BUILDKIT_INTEGRATION_DOCKERD_FLAGS: | --bip=10.66.66.1/24 --default-address-pool=base=10.66.66.0/16,size=24 diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index a5bef4224..5651530bf 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -20,7 +20,7 @@ on: env: GO_VERSION: "1.21" - SETUP_BUILDX_VERSION: "latest" + SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream SETUP_BUILDKIT_TAG: "moby/buildkit:latest" IMAGE_NAME: "docker/dockerfile-upstream" PLATFORMS: "linux/386,linux/amd64,linux/arm/v7,linux/arm64,linux/mips,linux/mipsle,linux/mips64,linux/mips64le,linux/s390x,linux/ppc64le,linux/riscv64" @@ -119,8 +119,9 @@ jobs: ./frontend/dockerfile/cmd/dockerfile-frontend/hack/release "${{ needs.prepare.outputs.typ }}" "${{ matrix.tag }}" "$IMAGE_NAME" "${{ needs.prepare.outputs.push }}" env: RELEASE: ${{ startsWith(github.ref, 'refs/tags/v') }} - CACHE_FROM: type=gha,scope=${{ env.CACHE_SCOPE }} - CACHE_TO: type=gha,scope=${{ env.CACHE_SCOPE }} + # TODO(jhorsts): replace with upstream + # CACHE_FROM: type=gha,scope=${{ env.CACHE_SCOPE }} + # CACHE_TO: type=gha,scope=${{ env.CACHE_SCOPE }} release: runs-on: ubuntu-22.04 diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 4dae49b6a..e7149a721 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -101,7 +101,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: binaries set: | @@ -128,7 +128,7 @@ jobs: uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v5 # TODO(jhorsts): replace with upstream with: name: buildkit-freebsd-amd64 path: ${{ env.DESTDIR }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 922cb08af..56c6c0d76 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -16,8 +16,8 @@ on: pull_request: env: - SETUP_BUILDX_VERSION: "latest" - SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" + SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream jobs: prepare: @@ -55,6 +55,6 @@ jobs: buildkitd-flags: --debug - name: Validate - uses: docker/bake-action@v4 + uses: docker/bake-action@v6 with: targets: ${{ matrix.target }} diff --git a/hack/release b/hack/release index 0e1fe8444..0b0357c30 100755 --- a/hack/release +++ b/hack/release @@ -50,8 +50,9 @@ for pdir in "${output}"/*/; do cd "$pdir" releasetar=$(find . -name '*.tar.gz') filename=$(basename "${releasetar%.tar.gz}") - mv "provenance.json" "${filename}.provenance.json" - mv "sbom-binaries.spdx.json" "${filename}.sbom.json" + # TODO(jhorsts): replace with upstream + # mv "provenance.json" "${filename}.provenance.json" + # mv "sbom-binaries.spdx.json" "${filename}.sbom.json" find . -name 'sbom*.json' -exec rm {} \; ) done From 7a3ada0079fe6d55c8eeddf3be0ca7f4fa95e860 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 00:04:31 +0100 Subject: [PATCH 02/14] chore: disable gha cache --- .github/workflows/.test.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 957461bb4..c3032a2c8 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -93,9 +93,10 @@ jobs: with: provenance: false targets: integration-tests-base - set: | - *.cache-from=type=gha,scope=${{ inputs.cache_scope }} - *.cache-to=type=gha,scope=${{ inputs.cache_scope }} + # TODO(jhorsts): replace with upstream + # set: | + # *.cache-from=type=gha,scope=${{ inputs.cache_scope }} + # *.cache-to=type=gha,scope=${{ inputs.cache_scope }} run: runs-on: ubuntu-22.04 From 39b2f1e3fbc0b5f2d119f35093fd5464715c69ae Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 09:16:35 +0100 Subject: [PATCH 03/14] chore: try moby/buildkit:latest --- .github/workflows/.test.yml | 2 +- .github/workflows/buildkit.yml | 4 ++-- .github/workflows/buildx-image.yml | 2 +- .github/workflows/dockerd.yml | 4 ++-- .github/workflows/test-os.yml | 2 +- .github/workflows/validate.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index c3032a2c8..dc4cc1678 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -29,7 +29,7 @@ on: env: GO_VERSION: "1.21" SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream - SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" jobs: prepare: diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index b4e5dc613..a2fa6f401 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -23,7 +23,7 @@ on: env: GO_VERSION: "1.21" SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream - SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" IMAGE_NAME: "moby/buildkit" PLATFORMS: "linux/amd64,linux/arm/v7,linux/arm64,linux/s390x,linux/ppc64le,linux/riscv64" DESTDIR: "./bin" @@ -192,7 +192,7 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v5 # TODO(jhorsts): replace with upstream + uses: actions/download-artifact@v5 with: path: ${{ env.DESTDIR }} - diff --git a/.github/workflows/buildx-image.yml b/.github/workflows/buildx-image.yml index d7220827b..93e10fab6 100644 --- a/.github/workflows/buildx-image.yml +++ b/.github/workflows/buildx-image.yml @@ -31,7 +31,7 @@ on: env: SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream - REPO_SLUG_TARGET: "moby/buildkit" # TODO(jhorsts): replace with upstream + REPO_SLUG_TARGET: "moby/buildkit" jobs: create: diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index be92a3d5e..fd2e2f910 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -11,7 +11,7 @@ on: env: SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream - SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" TESTFLAGS: "-v --parallel=1 --timeout=30m" jobs: @@ -109,7 +109,7 @@ jobs: buildkitd-flags: --debug - name: Download dockerd - uses: actions/download-artifact@v5 # TODO(jhorsts): replace with upstream + uses: actions/download-artifact@v5 with: name: dockerd path: ./build/ diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index e7149a721..bd320279f 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -128,7 +128,7 @@ jobs: uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@v5 # TODO(jhorsts): replace with upstream + uses: actions/download-artifact@v5 with: name: buildkit-freebsd-amd64 path: ${{ env.DESTDIR }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 56c6c0d76..2a885a02e 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -17,7 +17,7 @@ on: env: SETUP_BUILDX_VERSION: "v0.14.1" # TODO(jhorsts): replace with upstream - SETUP_BUILDKIT_IMAGE: "moby/buildkit:v0.19.0" # TODO(jhorsts): replace with upstream + SETUP_BUILDKIT_IMAGE: "moby/buildkit:latest" jobs: prepare: From 502ef4dec6bfe3523f68018baec4e62fa932294f Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 09:34:09 +0100 Subject: [PATCH 04/14] chore: restore artifact name --- .github/workflows/buildkit.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index a2fa6f401..629e3c706 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -194,6 +194,7 @@ jobs: name: Download artifacts uses: actions/download-artifact@v5 with: + name: buildkit path: ${{ env.DESTDIR }} - name: List artifacts From 912db84fdeefbcb557a5e6aefc5e2e9d5ed93322 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 11:39:45 +0100 Subject: [PATCH 05/14] chore: upload buildkit artifact --- .github/workflows/buildkit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 629e3c706..ccfffcbee 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -132,7 +132,7 @@ jobs: name: Upload artifacts uses: actions/upload-artifact@v4 with: - name: buildkit-${{ env.PLATFORM_PAIR }} + name: buildkit path: ${{ env.DESTDIR }}/* if-no-files-found: error From d5af27f535be7c3cf6d94a0bc06ddf2f5fe0c3be Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 11:46:08 +0100 Subject: [PATCH 06/14] chore: try to downgrade upload to v3 --- .github/workflows/buildkit.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index ccfffcbee..75a91bab4 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -130,7 +130,7 @@ jobs: # CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }} - name: Upload artifacts - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v3 with: name: buildkit path: ${{ env.DESTDIR }}/* From 56b4535a1dcc90b54c50171f6270d13c5a465a34 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 11:51:33 +0100 Subject: [PATCH 07/14] chore: upgrade upload to v4 --- .github/workflows/buildkit.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 75a91bab4..629e3c706 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -130,9 +130,9 @@ jobs: # CACHE_TO: type=gha,scope=binaries-${{ env.PLATFORM_PAIR }} - name: Upload artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: buildkit + name: buildkit-${{ env.PLATFORM_PAIR }} path: ${{ env.DESTDIR }}/* if-no-files-found: error From 5b67fca1057cec073d6ef48edf090f4ebf06e628 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 12:13:04 +0100 Subject: [PATCH 08/14] chore: set TEST_REPORT_NAME from upstream --- .github/workflows/.test.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index dc4cc1678..1039c9de7 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -130,6 +130,7 @@ jobs: for l in "${{ inputs.env }}"; do echo "${l?}" >> $GITHUB_ENV done + echo "TEST_REPORT_NAME=${{ github.job }}-$(echo "${{ matrix.pkg }}-${{ matrix.skip-integration-tests }}-${{ matrix.kind }}-${{ matrix.worker }}-${{ matrix.tags }}" | tr -dc '[:alnum:]-\n\r' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV - name: Checkout uses: actions/checkout@v4 @@ -194,7 +195,7 @@ jobs: if: always() uses: actions/upload-artifact@v4 with: - name: test-reports + name: test-reports-${{ env.TEST_REPORT_NAME }} path: ./bin/testreports overwrite: true - From 5a4df420a39920b7e67e23eab944cc002de83dd9 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 17:42:33 +0100 Subject: [PATCH 09/14] fix: download * artifacts --- .github/workflows/buildkit.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 629e3c706..a1261e534 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -194,8 +194,9 @@ jobs: name: Download artifacts uses: actions/download-artifact@v5 with: - name: buildkit path: ${{ env.DESTDIR }} + pattern: buildkit-* + merge-multiple: true - name: List artifacts run: | From 6e844e1d178bff7ce87a4466c341d5b6b8b7dbd4 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sat, 20 Sep 2025 19:05:41 +0100 Subject: [PATCH 10/14] chore: skip freebsd os smoke test --- .github/workflows/test-os.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index bd320279f..40d517bcb 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -116,6 +116,7 @@ jobs: retention-days: 1 test-freebsd-amd64: + if: false # TODO(jhorsts): Skip freebsd. Fails. Not supported by EarthBuild. Revisit after upstream merge? runs-on: macos-13 needs: - build-freebsd-amd64 From d7c042e17a636f40056fee449f9498eccfe71e1d Mon Sep 17 00:00:00 2001 From: Squirrel Date: Sun, 21 Sep 2025 09:29:05 +0100 Subject: [PATCH 11/14] Update .github/workflows/.test.yml --- .github/workflows/.test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 1039c9de7..9f815f479 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -89,7 +89,7 @@ jobs: }); - name: Build - uses: docker/bake-action@v6 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 with: provenance: false targets: integration-tests-base From b6c5514318912e68ce180dc8b6f2757785cfac4d Mon Sep 17 00:00:00 2001 From: Squirrel Date: Sun, 21 Sep 2025 09:34:34 +0100 Subject: [PATCH 12/14] Pin actions --- .github/workflows/.test.yml | 2 +- .github/workflows/buildkit.yml | 2 +- .github/workflows/dockerd.yml | 2 +- .github/workflows/test-os.yml | 4 ++-- .github/workflows/validate.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 9f815f479..3b060bfaf 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -149,7 +149,7 @@ jobs: buildkitd-flags: --debug - name: Build test image - uses: docker/bake-action@v6 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 with: provenance: false targets: integration-tests diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index a1261e534..352e89ac7 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -192,7 +192,7 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #v5.0.0 with: path: ${{ env.DESTDIR }} pattern: buildkit-* diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index fd2e2f910..0442c637f 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -109,7 +109,7 @@ jobs: buildkitd-flags: --debug - name: Download dockerd - uses: actions/download-artifact@v5 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #v5.0.0 with: name: dockerd path: ./build/ diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 40d517bcb..201514cf2 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -101,7 +101,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/bake-action@v6 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 with: targets: binaries set: | @@ -129,7 +129,7 @@ jobs: uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@v5 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #v5.0.0 with: name: buildkit-freebsd-amd64 path: ${{ env.DESTDIR }} diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 2a885a02e..2982ecf9b 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -55,6 +55,6 @@ jobs: buildkitd-flags: --debug - name: Validate - uses: docker/bake-action@v6 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 with: targets: ${{ matrix.target }} From 4b6fd79ad4e64f3395500c4633e2429ceb2493e3 Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sun, 21 Sep 2025 17:13:02 +0100 Subject: [PATCH 13/14] fix: yaml lint --- .github/workflows/buildkit.yml | 2 +- .github/workflows/dockerd.yml | 2 +- .github/workflows/validate.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 352e89ac7..7d646bb1d 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -192,7 +192,7 @@ jobs: steps: - name: Download artifacts - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #v5.0.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: path: ${{ env.DESTDIR }} pattern: buildkit-* diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index 0442c637f..6b9502968 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -109,7 +109,7 @@ jobs: buildkitd-flags: --debug - name: Download dockerd - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #v5.0.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: dockerd path: ./build/ diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 2982ecf9b..243bb1e94 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -55,6 +55,6 @@ jobs: buildkitd-flags: --debug - name: Validate - uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0 with: targets: ${{ matrix.target }} From 3ecde0a1a3fbd646dca38b417647355e0c37b57a Mon Sep 17 00:00:00 2001 From: Janis Horsts Date: Sun, 21 Sep 2025 17:24:17 +0100 Subject: [PATCH 14/14] fix: yaml lint --- .github/workflows/.test.yml | 4 ++-- .github/workflows/test-os.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 3b060bfaf..bf8012318 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -89,7 +89,7 @@ jobs: }); - name: Build - uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0 with: provenance: false targets: integration-tests-base @@ -149,7 +149,7 @@ jobs: buildkitd-flags: --debug - name: Build test image - uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0 with: provenance: false targets: integration-tests diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 201514cf2..862a8b254 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -101,7 +101,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Build - uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c #v6.9.0 + uses: docker/bake-action@3acf805d94d93a86cce4ca44798a76464a75b88c # v6.9.0 with: targets: binaries set: | @@ -129,7 +129,7 @@ jobs: uses: actions/checkout@v4 - name: Download artifacts - uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 #v5.0.0 + uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0 with: name: buildkit-freebsd-amd64 path: ${{ env.DESTDIR }}