From a598b731053c5c841274a946865cbdad91f76adb Mon Sep 17 00:00:00 2001
From: Ashley Cui <acui@redhat.com>
Date: Mon, 21 Nov 2022 14:13:31 -0500
Subject: [PATCH] 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 <acui@redhat.com>
---
 .cirrus.yml | 2 +-
 Makefile    | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 018d1b052e..67ae25eaf9 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -368,7 +368,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 90c3d98a19..09ece91ead 100644
--- a/Makefile
+++ b/Makefile
@@ -256,8 +256,10 @@ volume-plugin-test-img:
 test/goecho/goecho: $(wildcard test/goecho/*.go)
 	$(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho
 
+# 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
-	$(GO) build -o $@ ./test/version/
+	GOARCH=$(NATIVE_GOARCH) $(GO) build -o $@ ./test/version/
 
 .PHONY: codespell
 codespell: