From f9a535873f7b6833e79c970339ef296a0b16e5bd Mon Sep 17 00:00:00 2001 From: Goend Date: Wed, 17 Jan 2024 11:15:37 +0800 Subject: [PATCH 1/3] Trigger pipeline --- .gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitkeep diff --git a/.gitkeep b/.gitkeep new file mode 100644 index 00000000000..e69de29bb2d From 1d2d423b2d66ebf9a7f7d54c0f3a0cf6e79c24fd Mon Sep 17 00:00:00 2001 From: Goend Date: Wed, 17 Jan 2024 11:59:30 +0800 Subject: [PATCH 2/3] Trigger pipeline two --- .github/workflows/build-multi-stage.yaml | 16 ++++++++++++++++ Makefile | 10 +++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-multi-stage.yaml b/.github/workflows/build-multi-stage.yaml index 9dd416e3cf1..7af6cbd2693 100644 --- a/.github/workflows/build-multi-stage.yaml +++ b/.github/workflows/build-multi-stage.yaml @@ -25,3 +25,19 @@ jobs: # yamllint disable-line rule:line-length if: ${{ contains(github.event.pull_request.labels.*.name, 'ci/skip/multi-arch-build') }} run: make containerized-build + - name: Build binary + run: | + echo "creating images cache..." + docker save hub.easystack.io/captain/cephcsi:v3.9.0-es| pigz > ceph-csi-x86.tar.gz + docker save hub.easystack.io/arm64v8/cephcsi:v3.9.0-es| pigz > ceph-csi-arm.tar.gz + - name: cache x86 image + uses: actions/upload-artifact@v2 + with: + name: ceph-csi-x86.tar.gz + path: ceph-csi-x86.tar.gz + - name: cache arm image + uses: actions/upload-artifact@v2 + with: + name: ceph-csi-arm.tar.gz + path: ceph-csi-arm.tar.gz + diff --git a/Makefile b/Makefile index cb872e0dcfb..67d73ceeb8e 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,15 @@ ifeq ($(HAVE_CPUSET),1) CPUSET ?= --cpuset-cpus=0-${CPUS} endif -CSI_IMAGE_NAME=$(if $(ENV_CSI_IMAGE_NAME),$(ENV_CSI_IMAGE_NAME),hub.easystack.io/captain/cephcsi) + +ifeq ($(GOARCH),amd64) + CSI_IMAGE_NAME=hub.easystack.io/captain/cephcsi +else ifeq ($(GOARCH),arm64) + CSI_IMAGE_NAME=hub.easystack.io/arm64v8/cephcsi +else + $(error Unsupported GOARCH: $(GOARCH)) +endif + CSI_IMAGE_VERSION=$(shell . $(CURDIR)/build.env ; echo $${CSI_IMAGE_VERSION}) CSI_IMAGE=$(CSI_IMAGE_NAME):$(CSI_IMAGE_VERSION) From 7cf4b8677506b6e472fc2086d15ab2092d70d1f0 Mon Sep 17 00:00:00 2001 From: Goend Date: Wed, 17 Jan 2024 12:11:26 +0800 Subject: [PATCH 3/3] Trigger pipeline three --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 67d73ceeb8e..7f5c97ee564 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifeq ($(GOARCH),amd64) else ifeq ($(GOARCH),arm64) CSI_IMAGE_NAME=hub.easystack.io/arm64v8/cephcsi else - $(error Unsupported GOARCH: $(GOARCH)) + CSI_IMAGE_NAME=hub.easystack.io/arm64v8/cephcsi endif CSI_IMAGE_VERSION=$(shell . $(CURDIR)/build.env ; echo $${CSI_IMAGE_VERSION})