From a87fcf93c8e1fa4a0ac5ecd94f4333223e324d1f Mon Sep 17 00:00:00 2001 From: faiq Date: Fri, 21 Jun 2024 13:26:23 -0400 Subject: [PATCH 1/2] fix: adds a docker buildx step before release-snapshot --- make/goreleaser.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/make/goreleaser.mk b/make/goreleaser.mk index cd6993330..5c424c0de 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: +docker-buildx: + docker buildx create --use --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 $*) @@ -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 \ From bcfc236a3dc5221e9ab43573d8da9894cdc8e90b Mon Sep 17 00:00:00 2001 From: Daniel Lipovetsky Date: Fri, 21 Jun 2024 11:05:09 -0700 Subject: [PATCH 2/2] WIP --- .github/workflows/e2e.yml | 4 ---- 1 file changed, 4 deletions(-) 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: