From 8f7d1d17ce1cad08b6c56956e1a9efe200712ebf Mon Sep 17 00:00:00 2001 From: "blacksmith-sh[bot]" <157653362+blacksmith-sh[bot]@users.noreply.github.com> Date: Mon, 1 Jun 2026 18:06:32 +0000 Subject: [PATCH] Migrate workflows to Blacksmith --- .github/workflows/changes.yml | 6 +-- .../workflows/check_generated_vrl_docs.yml | 6 +-- .../check_generated_vrl_docs_comment.yml | 2 +- .github/workflows/ci-integration-review.yml | 8 ++-- .github/workflows/ci-review-trigger.yml | 4 +- .github/workflows/cla.yml | 2 +- .github/workflows/cleanup-ghcr-images.yml | 4 +- .github/workflows/coverage.yml | 2 +- .github/workflows/create_preview_sites.yml | 2 +- .github/workflows/cross.yml | 2 +- .github/workflows/deny.yml | 4 +- .github/workflows/install-sh.yml | 2 +- .github/workflows/integration-test.yml | 2 +- .github/workflows/integration.yml | 6 +-- .github/workflows/integration_windows.yml | 6 +-- .github/workflows/k8s_e2e.yml | 8 ++-- .github/workflows/labeler.yml | 2 +- .github/workflows/master_merge_queue.yml | 2 +- .github/workflows/msrv.yml | 2 +- .github/workflows/preview_site_trigger.yml | 2 +- .github/workflows/protobuf.yml | 2 +- .github/workflows/publish.yml | 24 +++++------ .github/workflows/regression.yml | 40 +++++++++---------- .../workflows/remove_docs_review_label.yml | 2 +- .github/workflows/remove_waiting_author.yml | 2 +- .github/workflows/scorecard.yml | 2 +- .github/workflows/semantic.yml | 2 +- .github/workflows/spelling.yml | 2 +- .github/workflows/static-analysis.yml | 2 +- .github/workflows/tero-release-please.yaml | 2 +- .github/workflows/tero-release.yaml | 22 +++++----- .github/workflows/test-make-command.yml | 2 +- .github/workflows/test.yml | 24 +++++------ .github/workflows/unit-tests.yml | 2 +- .github/workflows/unit_mac.yml | 2 +- .github/workflows/unit_windows.yml | 2 +- .github/workflows/vdev_publish.yml | 2 +- 37 files changed, 101 insertions(+), 109 deletions(-) diff --git a/.github/workflows/changes.yml b/.github/workflows/changes.yml index 246aff0001d64..fa38c6c23b1f5 100644 --- a/.github/workflows/changes.yml +++ b/.github/workflows/changes.yml @@ -163,7 +163,7 @@ env: jobs: # Detects changes that are not specific to integration tests source: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 if: ${{ inputs.source }} outputs: @@ -302,7 +302,7 @@ jobs: # Detects changes that are specific to integration tests int_tests: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 15 if: ${{ inputs.int_tests }} permissions: @@ -428,7 +428,7 @@ jobs: # Detects changes that are specific to e2e tests e2e_tests: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 15 if: ${{ inputs.e2e_tests }} permissions: diff --git a/.github/workflows/check_generated_vrl_docs.yml b/.github/workflows/check_generated_vrl_docs.yml index 4d30b4f8d5bd2..88be0ddfdd55f 100644 --- a/.github/workflows/check_generated_vrl_docs.yml +++ b/.github/workflows/check_generated_vrl_docs.yml @@ -21,7 +21,7 @@ permissions: jobs: changes: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read outputs: @@ -41,7 +41,7 @@ jobs: run-check-generated-vrl-docs: needs: changes if: needs.changes.outputs.docs == 'true' - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 permissions: contents: write steps: @@ -127,7 +127,7 @@ jobs: check-generated-vrl-docs: if: always() - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: run-check-generated-vrl-docs steps: - run: | diff --git a/.github/workflows/check_generated_vrl_docs_comment.yml b/.github/workflows/check_generated_vrl_docs_comment.yml index faa429af4de9b..89ccfbe8aceae 100644 --- a/.github/workflows/check_generated_vrl_docs_comment.yml +++ b/.github/workflows/check_generated_vrl_docs_comment.yml @@ -11,7 +11,7 @@ permissions: jobs: comment: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 if: > github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event == 'pull_request' diff --git a/.github/workflows/ci-integration-review.yml b/.github/workflows/ci-integration-review.yml index b042a76eb8ba9..e9d2aaeb38f2f 100644 --- a/.github/workflows/ci-integration-review.yml +++ b/.github/workflows/ci-integration-review.yml @@ -50,7 +50,7 @@ env: jobs: prep-pr: name: (PR review) Signal pending to PR - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 if: startsWith(github.event.review.body, '/ci-run-integration') || startsWith(github.event.review.body, '/ci-run-e2e') || contains(github.event.review.body, '/ci-run-all') permissions: @@ -95,7 +95,7 @@ jobs: needs: - prep-pr - build-test-runner - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 90 permissions: contents: read @@ -189,7 +189,7 @@ jobs: needs: - prep-pr - build-test-runner - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 timeout-minutes: 30 permissions: contents: read @@ -245,7 +245,7 @@ jobs: update-pr-status: name: Signal result to PR - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 needs: - integration-tests diff --git a/.github/workflows/ci-review-trigger.yml b/.github/workflows/ci-review-trigger.yml index 99e5f648a894d..b173fd4e2bcb6 100644 --- a/.github/workflows/ci-review-trigger.yml +++ b/.github/workflows/ci-review-trigger.yml @@ -63,7 +63,7 @@ env: jobs: validate: name: Validate review - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 if: | startsWith(github.event.review.body, '/ci-run-all') @@ -206,7 +206,7 @@ jobs: regression-parse: needs: validate if: startsWith(github.event.review.body, '/ci-run-regression') - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 outputs: baseline-sha: ${{ steps.parse.outputs.baseline }} diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 536e364a402b9..7d50c7fb6a6f7 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -12,7 +12,7 @@ permissions: jobs: CLAAssistant: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: pull-requests: write # Required to comment on PRs id-token: write # Required to federate tokens with dd-octo-sts-action diff --git a/.github/workflows/cleanup-ghcr-images.yml b/.github/workflows/cleanup-ghcr-images.yml index dced4f4f0d449..59a43b654491c 100644 --- a/.github/workflows/cleanup-ghcr-images.yml +++ b/.github/workflows/cleanup-ghcr-images.yml @@ -18,7 +18,7 @@ permissions: jobs: cleanup-vector-nightlies: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: packages: write # Required to delete package versions from GHCR steps: @@ -31,7 +31,7 @@ jobs: ignore-versions: '^(nightly$|\d+\.\d+)' cleanup-test-runner: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: packages: write # Required to delete package versions from GHCR steps: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a07ec850373a4..4ae2311ab0552 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -57,7 +57,7 @@ jobs: coverage-upload: name: Merge and Upload Coverage - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: - tests - integration-tests diff --git a/.github/workflows/create_preview_sites.yml b/.github/workflows/create_preview_sites.yml index 282a012192400..590b2f14f0261 100644 --- a/.github/workflows/create_preview_sites.yml +++ b/.github/workflows/create_preview_sites.yml @@ -27,7 +27,7 @@ permissions: jobs: create_preview_site: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 permissions: contents: read # Required for repository context diff --git a/.github/workflows/cross.yml b/.github/workflows/cross.yml index 7b66b7ccbf0a3..fb74fab51ad5a 100644 --- a/.github/workflows/cross.yml +++ b/.github/workflows/cross.yml @@ -14,7 +14,7 @@ permissions: jobs: cross-linux: name: Cross - ${{ matrix.target }} - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 45 env: CARGO_INCREMENTAL: 0 diff --git a/.github/workflows/deny.yml b/.github/workflows/deny.yml index cef811743e716..7b34b0c46e934 100644 --- a/.github/workflows/deny.yml +++ b/.github/workflows/deny.yml @@ -46,7 +46,7 @@ jobs: secrets: inherit test-deny: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 30 if: ${{ always() && (github.event_name != 'pull_request' || needs.changes.outputs.deny == 'true') }} needs: [changes] @@ -65,7 +65,7 @@ jobs: run: make check-deny test-deny-licenses: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 30 if: ${{ always() && (github.event_name != 'pull_request' || needs.changes.outputs.deny == 'true') }} needs: [changes] diff --git a/.github/workflows/install-sh.yml b/.github/workflows/install-sh.yml index 7d371baa27388..7a80f49b78502 100644 --- a/.github/workflows/install-sh.yml +++ b/.github/workflows/install-sh.yml @@ -19,7 +19,7 @@ permissions: jobs: test-install: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 steps: - name: Checkout branch diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 641f9ceb96d4b..86bbf4197ffc6 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -31,7 +31,7 @@ env: jobs: test-integration: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 40 permissions: contents: read diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml index a4b2bf1b07b2d..c8bef9995b3f1 100644 --- a/.github/workflows/integration.yml +++ b/.github/workflows/integration.yml @@ -83,7 +83,7 @@ jobs: checkout_ref: ${{ inputs.ref }} integration-tests: - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 permissions: contents: read id-token: write @@ -203,7 +203,7 @@ jobs: if-no-files-found: ignore e2e-tests: - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 permissions: contents: read id-token: write @@ -286,7 +286,7 @@ jobs: integration-test-suite: name: Integration Test Suite - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: always() needs: - changes diff --git a/.github/workflows/integration_windows.yml b/.github/workflows/integration_windows.yml index 1074ba4a3b97b..927fac28a0137 100644 --- a/.github/workflows/integration_windows.yml +++ b/.github/workflows/integration_windows.yml @@ -9,7 +9,7 @@ permissions: jobs: changes: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read outputs: @@ -32,7 +32,7 @@ jobs: run-test-integration-windows: needs: changes if: needs.changes.outputs.windows == 'true' - runs-on: windows-2025-8core + runs-on: blacksmith-8vcpu-windows-2025 timeout-minutes: 60 steps: - name: Checkout branch @@ -49,7 +49,7 @@ jobs: test-integration-windows: if: always() - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: run-test-integration-windows steps: - run: | diff --git a/.github/workflows/k8s_e2e.yml b/.github/workflows/k8s_e2e.yml index 71060116cfd78..4d11924dc990c 100644 --- a/.github/workflows/k8s_e2e.yml +++ b/.github/workflows/k8s_e2e.yml @@ -65,7 +65,7 @@ jobs: build-x86_64-unknown-linux-gnu: name: Build - x86_64-unknown-linux-gnu - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 45 needs: changes # Run this job even if `changes` job is skipped @@ -104,7 +104,7 @@ jobs: # See https://github.community/t/feature-request-and-use-case-example-to-allow-matrix-in-if-s/126067 compute-k8s-test-plan: name: Compute K8s test plan - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 needs: changes # Run this job even if `changes` job is skipped @@ -159,7 +159,7 @@ jobs: test-e2e-kubernetes: name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }}) - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 60 needs: - build-x86_64-unknown-linux-gnu @@ -245,7 +245,7 @@ jobs: final-result: name: K8s E2E Suite - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 needs: - changes diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml index 8bfb4b5fb26c9..181a4655b4acd 100644 --- a/.github/workflows/labeler.yml +++ b/.github/workflows/labeler.yml @@ -7,7 +7,7 @@ permissions: jobs: label: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 permissions: contents: read diff --git a/.github/workflows/master_merge_queue.yml b/.github/workflows/master_merge_queue.yml index 3eaffecfdb2cd..8eb1bdae3b964 100644 --- a/.github/workflows/master_merge_queue.yml +++ b/.github/workflows/master_merge_queue.yml @@ -133,7 +133,7 @@ jobs: name: Master Merge Queue Suite # Always run this so that pull_request triggers are marked as success. if: always() - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 needs: - changes diff --git a/.github/workflows/msrv.yml b/.github/workflows/msrv.yml index 5bc98ced18f2d..b0d1c508f1403 100644 --- a/.github/workflows/msrv.yml +++ b/.github/workflows/msrv.yml @@ -19,7 +19,7 @@ permissions: jobs: check-msrv: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 45 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/preview_site_trigger.yml b/.github/workflows/preview_site_trigger.yml index db74832c36d60..8cf0c980687b3 100644 --- a/.github/workflows/preview_site_trigger.yml +++ b/.github/workflows/preview_site_trigger.yml @@ -9,7 +9,7 @@ permissions: jobs: approval_check: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 permissions: contents: read # Required for repository context diff --git a/.github/workflows/protobuf.yml b/.github/workflows/protobuf.yml index bc9cca9baf473..c91f6b246c760 100644 --- a/.github/workflows/protobuf.yml +++ b/.github/workflows/protobuf.yml @@ -18,7 +18,7 @@ concurrency: jobs: validate-protos: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 steps: # Run `git checkout` diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 778fce2fb4b2c..39ed18db7c3f2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -44,7 +44,7 @@ env: jobs: generate-publish-metadata: name: Generate Publish-related Metadata - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 15 outputs: vector_version: ${{ steps.generate-publish-metadata.outputs.vector_version }} @@ -136,7 +136,7 @@ jobs: build-linux-cross: name: Build Vector for ${{ matrix.target }} - runs-on: release-builder-linux + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 60 needs: generate-publish-metadata env: @@ -192,7 +192,7 @@ jobs: # Refer to https://docs.github.com/en/actions/using-github-hosted-runners/using-larger-runners/about-larger-runners#about-macos-larger-runners. # and to https://github.com/actions/runner-images - architecture: arm64 - runner: macos-14-xlarge + runner: blacksmith-6vcpu-macos-15 steps: - name: Verify Runner Architecture run: | @@ -227,7 +227,7 @@ jobs: build-x86_64-pc-windows-msvc-packages: name: Build Vector for x86_64-pc-windows-msvc (.zip) - runs-on: windows-2025-8core + runs-on: blacksmith-8vcpu-windows-2025 timeout-minutes: 90 needs: generate-publish-metadata env: @@ -286,7 +286,7 @@ jobs: matrix: runner: - ubuntu-24.04 - - ubuntu-24.04-arm + - blacksmith-4vcpu-ubuntu-2404-arm container: - ubuntu:20.04 - ubuntu:22.04 @@ -421,7 +421,7 @@ jobs: publish-docker: name: Publish to Docker if: ${{ !inputs.skip_publish }} - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 15 # Elevated permission required to push Docker images to GitHub Container Registry permissions: @@ -455,11 +455,9 @@ jobs: uses: docker/setup-qemu-action@ce360397dd3f832beb865e1373c09c0e9f86d70a # v4.0.0 with: platforms: all - - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 - with: - version: latest + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Download all Linux package artifacts uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1 with: @@ -483,7 +481,7 @@ jobs: publish-s3: name: Publish to S3 if: ${{ !inputs.skip_publish }} - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 10 needs: - generate-publish-metadata @@ -522,7 +520,7 @@ jobs: name: Publish release to GitHub # We only publish to GitHub for versioned releases, not nightlies. if: ${{ !inputs.skip_publish && inputs.channel == 'release' }} - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 10 # Elevated permission required to create GitHub releases and upload release assets permissions: @@ -560,7 +558,7 @@ jobs: generate-sha256sum: name: Generate SHA256 checksums - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 needs: - generate-publish-metadata diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 5fbfdbc262156..3be02ab80e598 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -60,7 +60,7 @@ env: jobs: resolve-inputs: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 outputs: baseline-sha: ${{ steps.set_and_validate_shas.outputs.BASELINE_SHA }} comparison-sha: ${{ steps.set_and_validate_shas.outputs.COMPARISON_SHA }} @@ -122,7 +122,7 @@ jobs: # Only run this workflow if files changed in areas that could possibly introduce a regression. check-source-changed: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 needs: resolve-inputs outputs: @@ -182,7 +182,7 @@ jobs: echo "SOURCE_CHANGED=${SOURCE_CHANGED}" >> $GITHUB_OUTPUT should-run-gate: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: check-source-changed if: ${{ needs.check-source-changed.outputs.source_changed }} steps: @@ -195,7 +195,7 @@ jobs: build-baseline: name: Build baseline Vector container - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 60 needs: - should-run-gate @@ -210,16 +210,14 @@ jobs: ref: ${{ needs.resolve-inputs.outputs.baseline-sha }} path: baseline-vector - - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Build 'vector' target image - uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 + uses: useblacksmith/build-push-action@v2 with: context: baseline-vector/ - cache-from: type=gha - cache-to: type=gha,mode=max file: baseline-vector/regression/Dockerfile builder: ${{ steps.buildx.outputs.name }} outputs: type=docker,dest=${{ runner.temp }}/baseline-image.tar @@ -234,7 +232,7 @@ jobs: build-comparison: name: Build comparison Vector container - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 60 needs: - should-run-gate @@ -249,16 +247,14 @@ jobs: ref: ${{ needs.resolve-inputs.outputs.comparison-sha }} path: comparison-vector - - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0 + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Build 'vector' target image - uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2 + uses: useblacksmith/build-push-action@v2 with: context: comparison-vector/ - cache-from: type=gha - cache-to: type=gha,mode=max file: comparison-vector/regression/Dockerfile builder: ${{ steps.buildx.outputs.name }} outputs: type=docker,dest=${{ runner.temp }}/comparison-image.tar @@ -273,7 +269,7 @@ jobs: confirm-valid-credentials: name: Confirm AWS credentials are minimally valid - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 timeout-minutes: 5 needs: - should-run-gate @@ -299,7 +295,7 @@ jobs: upload-baseline-image-to-ecr: name: Upload baseline images to ECR - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 timeout-minutes: 5 needs: - should-run-gate @@ -342,7 +338,7 @@ jobs: upload-comparison-image-to-ecr: name: Upload comparison images to ECR - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 timeout-minutes: 5 needs: - should-run-gate @@ -385,7 +381,7 @@ jobs: submit-job: name: Submit regression job - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 timeout-minutes: 120 needs: - should-run-gate @@ -464,7 +460,7 @@ jobs: detect-regression: name: Determine regression status - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 timeout-minutes: 5 needs: - submit-job @@ -505,7 +501,7 @@ jobs: analyze-experiment: name: Download regression analysis & upload report - runs-on: ubuntu-22.04 + runs-on: blacksmith-4vcpu-ubuntu-2204 timeout-minutes: 5 needs: - should-run-gate @@ -560,7 +556,7 @@ jobs: regression-detection-suite: name: Set final result - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 if: always() needs: diff --git a/.github/workflows/remove_docs_review_label.yml b/.github/workflows/remove_docs_review_label.yml index 093c5a4bd5e90..09d6a6a09640e 100644 --- a/.github/workflows/remove_docs_review_label.yml +++ b/.github/workflows/remove_docs_review_label.yml @@ -17,7 +17,7 @@ env: jobs: remove_label: if: github.event.review.state == 'approved' - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 steps: - name: Check association, label, and remove diff --git a/.github/workflows/remove_waiting_author.yml b/.github/workflows/remove_waiting_author.yml index b431395b743ef..aae2bafe9e16a 100644 --- a/.github/workflows/remove_waiting_author.yml +++ b/.github/workflows/remove_waiting_author.yml @@ -13,7 +13,7 @@ on: jobs: remove_label: if: "contains(github.event.pull_request.labels.*.name, 'meta: awaiting author')" - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 steps: - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml index 9e64b64ccfabd..6123e95592c8d 100644 --- a/.github/workflows/scorecard.yml +++ b/.github/workflows/scorecard.yml @@ -20,7 +20,7 @@ permissions: read-all jobs: analysis: name: Scorecard analysis - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: # Needed to upload the results to code-scanning dashboard. security-events: write diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml index 6d801c49d5de9..7e5f2fec706f1 100644 --- a/.github/workflows/semantic.yml +++ b/.github/workflows/semantic.yml @@ -18,7 +18,7 @@ jobs: pull-requests: read # for amannn/action-semantic-pull-request to analyze PRs statuses: write # for amannn/action-semantic-pull-request to mark status of analyzed PR name: Check Semantic PR - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 steps: - uses: amannn/action-semantic-pull-request@48f256284bd46cdaab1048c3721360e808335d50 # v6.1.1 env: diff --git a/.github/workflows/spelling.yml b/.github/workflows/spelling.yml index 3b2c1f57f2d12..6d5cd0ee367bf 100644 --- a/.github/workflows/spelling.yml +++ b/.github/workflows/spelling.yml @@ -80,7 +80,7 @@ jobs: security-events: write outputs: followup: ${{ steps.spelling.outputs.followup }} - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 timeout-minutes: 5 if: "contains(github.event_name, 'pull_request') || github.event_name == 'push'" concurrency: diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml index f74c6681d8ea5..26025735e7b48 100644 --- a/.github/workflows/static-analysis.yml +++ b/.github/workflows/static-analysis.yml @@ -12,7 +12,7 @@ permissions: jobs: static-analysis: - runs-on: ubuntu-latest + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read id-token: write diff --git a/.github/workflows/tero-release-please.yaml b/.github/workflows/tero-release-please.yaml index bf1a026092b47..991a41dcb929c 100644 --- a/.github/workflows/tero-release-please.yaml +++ b/.github/workflows/tero-release-please.yaml @@ -27,7 +27,7 @@ concurrency: jobs: release-please: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 # Don't fire in the upstream `vectordotdev/vector` repo if this fork's # `master` is ever pushed back upstream by accident. if: github.repository_owner == 'usetero' diff --git a/.github/workflows/tero-release.yaml b/.github/workflows/tero-release.yaml index 33071a99251d6..a9455ae28e88e 100644 --- a/.github/workflows/tero-release.yaml +++ b/.github/workflows/tero-release.yaml @@ -44,7 +44,7 @@ env: jobs: prepare: name: Prepare release - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: github.repository_owner == 'usetero' outputs: version: ${{ steps.version.outputs.version }} @@ -192,7 +192,7 @@ jobs: runner: ubuntu-24.04 platform: linux/amd64 - arch: arm64 - runner: ubuntu-24.04-arm + runner: blacksmith-8vcpu-ubuntu-2404-arm platform: linux/arm64 steps: - name: Checkout @@ -209,8 +209,8 @@ jobs: chmod +x "${{ matrix.arch }}/vector" ls -la "${{ matrix.arch }}/" - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Log in to Container Registry if: ${{ !inputs.dry_run }} @@ -222,14 +222,12 @@ jobs: - name: Build and push by digest id: build - uses: docker/build-push-action@v6 + uses: useblacksmith/build-push-action@v2 with: context: . file: distribution/docker/tero/Dockerfile platforms: ${{ matrix.platform }} outputs: type=image,name=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }},push-by-digest=true,name-canonical=true,push=${{ !inputs.dry_run }} - cache-from: type=gha,scope=${{ matrix.arch }} - cache-to: type=gha,mode=max,scope=${{ matrix.arch }} - name: Export digest if: ${{ !inputs.dry_run }} @@ -250,7 +248,7 @@ jobs: merge-docker-manifest: name: Merge Docker manifests - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: [prepare, build-docker] if: ${{ !inputs.dry_run }} steps: @@ -261,8 +259,8 @@ jobs: pattern: digests-* merge-multiple: true - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 + - name: Setup Blacksmith Builder + uses: useblacksmith/setup-docker-builder@v1 - name: Log in to Container Registry uses: docker/login-action@v3 @@ -298,7 +296,7 @@ jobs: upload-release-assets: name: Attach binaries to GitHub Release - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: [prepare, build-binary, merge-docker-manifest] if: ${{ !inputs.dry_run && github.event_name == 'push' }} permissions: @@ -331,7 +329,7 @@ jobs: summary: name: Release summary - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: [prepare, build-binary, build-docker, merge-docker-manifest, upload-release-assets] if: always() steps: diff --git a/.github/workflows/test-make-command.yml b/.github/workflows/test-make-command.yml index b0a5e9aa6b4aa..d0d10733eb876 100644 --- a/.github/workflows/test-make-command.yml +++ b/.github/workflows/test-make-command.yml @@ -31,7 +31,7 @@ permissions: jobs: run-make-command: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 permissions: contents: read id-token: write diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5244d8110d823..d0bd3164ca7c9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -29,7 +29,7 @@ jobs: check-fmt: name: Check code format - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.test-yml == 'true' || needs.changes.outputs.prettier == 'true' }} needs: changes steps: @@ -42,7 +42,7 @@ jobs: check-clippy: name: Check clippy - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -68,7 +68,7 @@ jobs: check-scripts: name: Check scripts - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.scripts == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -82,7 +82,7 @@ jobs: check-events: name: Check events - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -96,7 +96,7 @@ jobs: check-licenses: name: Check that the 3rd-party license file is up to date - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.dependencies == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -111,7 +111,7 @@ jobs: check-docs: name: Check Cue docs - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.cue == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -126,7 +126,7 @@ jobs: check-markdown: name: Check Markdown - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.markdown == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -139,7 +139,7 @@ jobs: check-generated-docs: name: Check Generated Docs - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.component_docs == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -154,7 +154,7 @@ jobs: check-rust-docs: name: Check Rust Docs - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -166,7 +166,7 @@ jobs: test-vrl: name: VRL - Linux - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.cue == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -180,7 +180,7 @@ jobs: build-vrl-playground: name: Build VRL Playground - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 if: ${{ needs.changes.outputs.source == 'true' || needs.changes.outputs.dependencies == 'true' || needs.changes.outputs.test-yml == 'true' }} needs: changes steps: @@ -196,7 +196,7 @@ jobs: all-checks: name: Test Suite - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 if: always() needs: - changes diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index b6bf76de5f10c..883f32224e9c0 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -61,7 +61,7 @@ env: jobs: tests: name: Tests - runs-on: ubuntu-24.04-8core + runs-on: blacksmith-8vcpu-ubuntu-2404 permissions: contents: read id-token: write diff --git a/.github/workflows/unit_mac.yml b/.github/workflows/unit_mac.yml index aec7b4521e26a..82f4ad0a619e3 100644 --- a/.github/workflows/unit_mac.yml +++ b/.github/workflows/unit_mac.yml @@ -13,7 +13,7 @@ permissions: jobs: unit-mac: - runs-on: macos-14-xlarge + runs-on: blacksmith-6vcpu-macos-15 timeout-minutes: 90 steps: - name: Checkout branch diff --git a/.github/workflows/unit_windows.yml b/.github/workflows/unit_windows.yml index a4553b4a0b751..f51ca9ed59b4f 100644 --- a/.github/workflows/unit_windows.yml +++ b/.github/workflows/unit_windows.yml @@ -13,7 +13,7 @@ permissions: jobs: test-windows: - runs-on: windows-2025-8core + runs-on: blacksmith-8vcpu-windows-2025 timeout-minutes: 60 steps: - name: Checkout branch diff --git a/.github/workflows/vdev_publish.yml b/.github/workflows/vdev_publish.yml index a3757e387519d..f0d1716df6c5a 100644 --- a/.github/workflows/vdev_publish.yml +++ b/.github/workflows/vdev_publish.yml @@ -61,7 +61,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} publish: - runs-on: ubuntu-24.04 + runs-on: blacksmith-4vcpu-ubuntu-2404 needs: build env: DISABLE_MOLD: true