From e4ff5e282338f14df071d066628772a459322f8e Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Mon, 13 Mar 2023 12:32:53 +0100 Subject: [PATCH] hack: remove build_ci_first_pass script Signed-off-by: CrazyMax --- .github/workflows/.test.yml | 11 ++++++----- docker-bake.hcl | 6 ++++++ hack/build_ci_first_pass | 27 --------------------------- 3 files changed, 12 insertions(+), 32 deletions(-) delete mode 100755 hack/build_ci_first_pass diff --git a/.github/workflows/.test.yml b/.github/workflows/.test.yml index 8b4d097fd52a..2e6eea1f06ff 100644 --- a/.github/workflows/.test.yml +++ b/.github/workflows/.test.yml @@ -90,11 +90,12 @@ jobs: }); - name: Build - run: | - ./hack/build_ci_first_pass integration-tests - env: - CACHE_FROM: type=gha,scope=${{ inputs.cache_scope }} - CACHE_TO: type=gha,scope=${{ inputs.cache_scope }} + uses: docker/bake-action@v2 + with: + targets: integration-tests-base + set: | + *.cache-from=type=gha,scope=${{ inputs.cache_scope }} + *.cache-to=type=gha,scope=${{ inputs.cache_scope }} run: runs-on: ubuntu-20.04 diff --git a/docker-bake.hcl b/docker-bake.hcl index 97abaec3699a..6d60a138ff34 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -68,6 +68,12 @@ target "release" { output = [bindir("release")] } +target "integration-tests-base" { + inherits = ["_common"] + target = "integration-tests-base" + output = ["type=cacheonly"] +} + group "validate" { targets = ["lint", "validate-vendor", "validate-doctoc", "validate-generated-files", "validate-shfmt"] } diff --git a/hack/build_ci_first_pass b/hack/build_ci_first_pass deleted file mode 100755 index d344b0229b52..000000000000 --- a/hack/build_ci_first_pass +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -TYP=$1 - -. $(dirname $0)/util -set -e - -usage() { - echo "usage: ./hack/build_ci_first_pass " - exit 1 -} - -if [ -z "$TYP" ]; then - usage -fi - -case $TYP in - "integration-tests") - buildxCmd build $cacheFromFlags $cacheToFlags \ - --target "integration-tests-base" \ - $currentcontext - ;; - *) - echo >&2 "Unknown type $TYP" - exit 1 - ;; -esac