diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml index 78de9df5d..80e5471b9 100644 --- a/.github/workflows/checks.yml +++ b/.github/workflows/checks.yml @@ -194,12 +194,6 @@ jobs: echo "changed=true" >> "$GITHUB_OUTPUT" fi - - if: steps.list-changed.outputs.changed == 'true' - uses: docker/setup-qemu-action@v3 - - - if: steps.list-changed.outputs.changed == 'true' - uses: docker/setup-buildx-action@v3 - - if: steps.list-changed.outputs.changed == 'true' name: Run chart-testing (lint) run: | diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d888d654e..487e9af92 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -55,10 +55,6 @@ jobs: echo "After removing files:" df -h - - uses: docker/setup-qemu-action@v3 - - - uses: docker/setup-buildx-action@v3 - - name: Run e2e tests run: devbox run -- make e2e-test E2E_LABEL='provider:${{ inputs.provider }}' E2E_SKIP='${{ inputs.skip }}' E2E_FOCUS='${{ inputs.focus }}' env: diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 42b50fa52..c09b2f99c 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -27,10 +27,6 @@ jobs: ref: ${{ github.ref }} fetch-depth: 0 - - uses: docker/setup-qemu-action@v3 - - - uses: docker/setup-buildx-action@v3 - - name: Install devbox uses: jetify-com/devbox-install-action@v0.11.0 with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 18bbf8953..9e428a8d5 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -111,6 +111,7 @@ dockers: - hack/addons/mindthegap-helm-registry/repos.yaml build_flag_templates: - "--platform=linux/amd64" + - "--builder=caren" - "--pull" - "--label=org.opencontainers.image.created={{.CommitDate}}" - "--label=org.opencontainers.image.title=caren-helm-reg" @@ -132,6 +133,7 @@ dockers: - hack/addons/mindthegap-helm-registry/repos.yaml build_flag_templates: - "--platform=linux/arm64" + - "--builder=caren" - "--pull" - "--label=org.opencontainers.image.created={{.CommitDate}}" - "--label=org.opencontainers.image.title=caren-helm-reg" diff --git a/make/goreleaser.mk b/make/goreleaser.mk index cd6993330..219cb7c36 100644 --- a/make/goreleaser.mk +++ b/make/goreleaser.mk @@ -8,6 +8,11 @@ ifndef GORELEASER_CURRENT_TAG export GORELEASER_CURRENT_TAG=$(GIT_TAG) endif +.PHONY: docker-buildx +docker-buildx: ## Creates buildx builder container that supports multiple platforms. +docker-buildx: + docker buildx create --name=caren --platform=linux/arm64,linux/amd64 || true + .PHONY: build-snapshot build-snapshot: ## Builds a snapshot with goreleaser build-snapshot: go-generate ; $(info $(M) building snapshot $*) @@ -20,7 +25,7 @@ build-snapshot: go-generate ; $(info $(M) building snapshot $*) .PHONY: release release: ## Builds a release with goreleaser -release: go-generate ; $(info $(M) building release $*) +release: docker-buildx go-generate ; $(info $(M) building release $*) goreleaser --verbose=$(GORELEASER_VERBOSE) \ release \ --clean \ @@ -30,7 +35,7 @@ release: go-generate ; $(info $(M) building release $*) .PHONY: release-snapshot release-snapshot: ## Builds a snapshot release with goreleaser -release-snapshot: go-generate ; $(info $(M) building snapshot release $*) +release-snapshot: docker-buildx go-generate ; $(info $(M) building snapshot release $*) goreleaser --verbose=$(GORELEASER_VERBOSE) \ release \ --snapshot \