Merge pull request #17007 from lsm5/v4.0-rhel-osx

[BACKPORT v4.0-rhel] [CI:DOCS] Migrate OSX Cross to M1
This commit is contained in:
Daniel J Walsh
2023-01-05 13:49:40 -05:00
committed by GitHub
2 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -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: