From bc41ac2f83b8b45ca0ebb986381d68ff29524483 Mon Sep 17 00:00:00 2001 From: SandhyaRavi Date: Wed, 23 Oct 2024 13:14:15 +0530 Subject: [PATCH 1/5] ci: update the arch in workflow --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index faffadcd7..8f9552a87 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,6 +7,11 @@ jobs: build: name: Build runs-on: ubuntu-latest + strategy: + matrix: + arch: + - amd64 + - arm64 steps: - name: Checkout code uses: actions/checkout@v4 @@ -29,4 +34,4 @@ jobs: export VERSION=${{ github.ref_name }} export DOCKER_CLI_EXPERIMENTAL=enabled export OUTPUT_TYPE=docker - make build-and-push-container-linux-amd64 + make build-and-push-container-linux-${{ matrix.arch }} From 2b0eecc8d35d94b896a39f25fefdd4c56f93d5ac Mon Sep 17 00:00:00 2001 From: SandhyaRavi Date: Wed, 23 Oct 2024 14:14:03 +0530 Subject: [PATCH 2/5] ci: update the arch in workflow --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 185ff42fd..4303345d1 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ build-node-cleanup-controller-linux-%: build-and-push-container-linux-%: init-buildx CGO_ENABLED=0 GOOS=linux GOARCH=$* go build -a -ldflags '-extldflags "-static"' -mod vendor -o _output/linux/$*/local-volume-provisioner ./cmd/local-volume-provisioner $(DOCKER) buildx build --file=./deployment/docker/Dockerfile --platform=linux/$* \ - -t $(STAGINGIMAGE):$(STAGINGVERSION)_linux_$* \ + -t $(STAGINGIMAGE):$(STAGINGVERSION) \ --build-arg OS=linux \ --build-arg ARCH=$* \ --push . From 17b3fe3c565da87247a357a04d98be3722cd4537 Mon Sep 17 00:00:00 2001 From: SandhyaRavi Date: Wed, 23 Oct 2024 16:43:43 +0530 Subject: [PATCH 3/5] ci: update the arch in workflow --- .github/workflows/build.yml | 4 +++- Makefile | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8f9552a87..0d8165d22 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,8 @@ jobs: run: | export REGISTRY=ghcr.io/mesosphere export VERSION=${{ github.ref_name }} + export LINUX_ARCH=${{ matrix.arch }} + export SKIP_PUSH_LATEST=1 export DOCKER_CLI_EXPERIMENTAL=enabled export OUTPUT_TYPE=docker - make build-and-push-container-linux-${{ matrix.arch }} + make release diff --git a/Makefile b/Makefile index 4303345d1..185ff42fd 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ build-node-cleanup-controller-linux-%: build-and-push-container-linux-%: init-buildx CGO_ENABLED=0 GOOS=linux GOARCH=$* go build -a -ldflags '-extldflags "-static"' -mod vendor -o _output/linux/$*/local-volume-provisioner ./cmd/local-volume-provisioner $(DOCKER) buildx build --file=./deployment/docker/Dockerfile --platform=linux/$* \ - -t $(STAGINGIMAGE):$(STAGINGVERSION) \ + -t $(STAGINGIMAGE):$(STAGINGVERSION)_linux_$* \ --build-arg OS=linux \ --build-arg ARCH=$* \ --push . From 9e3ad2c343ad4855e02dc2ca0415eed530f22439 Mon Sep 17 00:00:00 2001 From: SandhyaRavi2403 Date: Wed, 23 Oct 2024 18:57:57 +0530 Subject: [PATCH 4/5] Update .github/workflows/build.yml Co-authored-by: Martin Hrabovcin --- .github/workflows/build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d8165d22..62b6a90b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,11 +7,6 @@ jobs: build: name: Build runs-on: ubuntu-latest - strategy: - matrix: - arch: - - amd64 - - arm64 steps: - name: Checkout code uses: actions/checkout@v4 From e4a0a590dbea966a55aefcbdf0c7c8876006a422 Mon Sep 17 00:00:00 2001 From: SandhyaRavi2403 Date: Wed, 23 Oct 2024 18:58:07 +0530 Subject: [PATCH 5/5] Update .github/workflows/build.yml Co-authored-by: Martin Hrabovcin --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 62b6a90b0..44b384c01 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,8 @@ jobs: run: | export REGISTRY=ghcr.io/mesosphere export VERSION=${{ github.ref_name }} - export LINUX_ARCH=${{ matrix.arch }} + export LINUX_ARCH="amd64 arm64" + export WINDOWS_DISTROS="" export SKIP_PUSH_LATEST=1 export DOCKER_CLI_EXPERIMENTAL=enabled export OUTPUT_TYPE=docker