From d6ea5b13f331f24887f214aa427188d80a4ff1eb Mon Sep 17 00:00:00 2001 From: Ashley Cui Date: Mon, 21 Nov 2022 14:13:31 -0500 Subject: [PATCH] [CI:DOCS] Migrate OSX Cross to M1 Migrate our OSX Cross build to a M1 instance, since Cirrus is sunsetting Intel-based macOS instances. Signed-off-by: Ashley Cui (cherry picked from commit a575111ad4bcaa8c9ec4b0c4f7ecc5197e5be43f) Signed-off-by: Lokesh Mandvekar --- .cirrus.yml | 2 +- Makefile | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 4e90796230..b9cf0fed61 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -347,7 +347,7 @@ osx_alt_build_task: TEST_FLAVOR: "altbuild" ALT_NAME: 'OSX Cross' osx_instance: - image: 'big-sur-base' + image: ghcr.io/cirruslabs/macos-ventura-base:latest setup_script: - brew install go - brew install go-md2man diff --git a/Makefile b/Makefile index 51de5fd560..f6fcddace7 100644 --- a/Makefile +++ b/Makefile @@ -277,8 +277,10 @@ volume-plugin-test-img: test/goecho/goecho: .gopathok $(wildcard test/goecho/*.go) $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho -test/version/version: .gopathok version/version.go - $(GO) build -o $@ ./test/version/ +# The ./test/version/version binary is executed in other make steps +# so we have to make sure the version binary is built for NATIVE_GOARCH. +test/version/version: version/version.go + GOARCH=$(NATIVE_GOARCH) $(GO) build -o $@ ./test/version/ .PHONY: codespell codespell: