From 97e0577279d6f720bd35b3375bc40b25eda04874 Mon Sep 17 00:00:00 2001 From: Rob Nester Date: Mon, 3 Nov 2025 11:50:45 -0500 Subject: [PATCH] update multi-arch build matrix This commit updates the multi-arch build matrix to include support for `ppc64le` and `s390x` subsequent to work from #2704 which added support for multi-arch builds. Ref: EC-1519 Co-authored-by: Claude Signed-off-by: Rob Nester --- .tekton/cli-main-push.yaml | 2 ++ Makefile | 3 ++- rpms.in.yaml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.tekton/cli-main-push.yaml b/.tekton/cli-main-push.yaml index 394b01909..7562532bc 100644 --- a/.tekton/cli-main-push.yaml +++ b/.tekton/cli-main-push.yaml @@ -112,6 +112,8 @@ spec: - default: - linux/x86_64 - linux/arm64 + - linux/ppc64le + - linux/s390x description: List of platforms to build the container images on name: build-platforms type: array diff --git a/Makefile b/Makefile index 6d1b9aefe..e987b5b3c 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ MAKEFLAGS+=-j --no-print-directory VERSION_FILE=./VERSION VERSION:=$$(hack/derive-version.sh) # a list of "dist/ec_{platform}_{arch}" that we support -ALL_SUPPORTED_OS_ARCH:=$(shell go tool dist list -json|jq -r '.[] | select((.FirstClass == true or .GOARCH == "ppc64le") and .GOARCH != "386") | "dist/ec_\(.GOOS)_\(.GOARCH)"') +ALL_SUPPORTED_OS_ARCH:=$(shell go tool dist list -json|jq -r '.[] | select((.FirstClass == true or .GOARCH == "ppc64le" or .GOARCH == "s390x") and .GOARCH != "386") | "dist/ec_\(.GOOS)_\(.GOARCH)"') # a list of image_* targets that we do not support UNSUPPORTED_OS_ARCH_IMG:=image_windows_amd64 image_darwin_amd64 image_darwin_arm64 image_linux_arm # a list of image_* targets that we do support generated from @@ -252,6 +252,7 @@ $(ALL_SUPPORTED_IMG_OS_ARCH): # image_linux_amd64 # image_linux_arm64 # image_linux_ppc64le +# image_linux_s390x show-supported-builds: @for b in $(ALL_SUPPORTED_IMG_OS_ARCH); do echo $$b; done diff --git a/rpms.in.yaml b/rpms.in.yaml index c93046642..a47dc31af 100644 --- a/rpms.in.yaml +++ b/rpms.in.yaml @@ -24,6 +24,7 @@ arches: - x86_64 - aarch64 - ppc64le + - s390x contentOrigin: # ubi.repo is extracted from the base image by the hack/update-rpm-lock.sh repofiles: