diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 65f5b6d757b5..fea5a2e09155 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -36,7 +36,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: pkgs: ${{ steps.set.outputs.pkgs }} kinds: ${{ steps.set.outputs.kinds }} @@ -102,7 +102,7 @@ jobs: *.cache-to=type=gha,scope=${{ inputs.cache_scope }},repository=${{ github.repository }},ghtoken=${{ github.token }} run: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: - prepare env: diff --git a/.github/workflows/buildkit.yml b/.github/workflows/buildkit.yml index 66f573c17ebe..033c16b790c9 100644 --- a/.github/workflows/buildkit.yml +++ b/.github/workflows/buildkit.yml @@ -33,7 +33,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: binaries-platforms: ${{ steps.platforms.outputs.matrix }} steps: @@ -66,7 +66,7 @@ jobs: sign: ${{ github.event_name != 'pull_request' }} binaries-finalize: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: - binaries steps: @@ -139,7 +139,7 @@ jobs: codecov_token: ${{ secrets.CODECOV_TOKEN }} govulncheck: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read # same as global permission security-events: write # required to write sarif report @@ -166,7 +166,7 @@ jobs: sarif_file: ${{ env.DESTDIR }}/govulncheck.out image-prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: includes: ${{ steps.set.outputs.includes }} steps: @@ -288,7 +288,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} scout: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ github.ref == 'refs/heads/master' && github.repository == 'moby/buildkit' }} permissions: # same as global permission @@ -332,7 +332,7 @@ jobs: sarif_file: ${{ steps.scout.outputs.result-file }} release: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: # required to create GitHub release contents: write diff --git a/.github/workflows/buildx-image.yml b/.github/workflows/buildx-image.yml index 5d736bd4cf42..ab12a219e058 100644 --- a/.github/workflows/buildx-image.yml +++ b/.github/workflows/buildx-image.yml @@ -36,7 +36,7 @@ env: jobs: create: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 strategy: fail-fast: false matrix: diff --git a/.github/workflows/create-patched-release.yml b/.github/workflows/create-patched-release.yml index d37093cfc9fb..0ddc99e999fa 100644 --- a/.github/workflows/create-patched-release.yml +++ b/.github/workflows/create-patched-release.yml @@ -22,7 +22,7 @@ permissions: jobs: create-release: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index a0bd6a77bc5f..ff1cfe95d0ff 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -19,7 +19,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - name: Prepare @@ -76,7 +76,7 @@ jobs: retention-days: 1 test: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: - prepare strategy: diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml index 2ad4957ff56f..c9cbd18cd784 100644 --- a/.github/workflows/frontend.yml +++ b/.github/workflows/frontend.yml @@ -42,7 +42,7 @@ jobs: codecov_token: ${{ secrets.CODECOV_TOKEN }} prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: includes: ${{ steps.set.outputs.includes }} tag: ${{ steps.set.outputs.tag }} @@ -188,7 +188,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} scout: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ github.repository == 'moby/buildkit' && github.ref == 'refs/heads/master' }} permissions: # same as global permission @@ -232,7 +232,7 @@ jobs: sarif_file: ${{ steps.scout.outputs.result-file }} release: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: startsWith(github.ref, 'refs/tags/dockerfile') permissions: # required to create GitHub release diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 3898f4ad80cd..4ffe5e8f843c 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -15,7 +15,7 @@ jobs: permissions: contents: read pull-requests: write - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - name: Run diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml index 86773cd56c0c..a1a21af951ca 100644 --- a/.github/workflows/test-os.yml +++ b/.github/workflows/test-os.yml @@ -29,7 +29,7 @@ env: jobs: build: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 strategy: fail-fast: false matrix: @@ -82,7 +82,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-2022] + os: [blacksmith-4vcpu-windows-2025] worker: - containerd pkg: @@ -107,7 +107,7 @@ jobs: - ./frontend/dockerfile#11-12 - ./frontend/dockerfile#12-12 include: - - os: windows-2022 + - os: blacksmith-4vcpu-windows-2025 worker: containerd pkg: ./... skip-integration-tests: 1 @@ -193,7 +193,7 @@ jobs: retention-days: 1 test-freebsd-amd64: - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 needs: - build env: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 66d78634e9b0..404e878533ab 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -24,7 +24,7 @@ env: jobs: prepare: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: includes: ${{ steps.matrix.outputs.includes }} steps: