opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17010 from openshift-cherrypick-robot/cherry-pick-16577-to-v4.2.0-rhel

Browse Source 
[v4.2.0-rhel] [CI:DOCS] Migrate OSX Cross to M1
This commit is contained in:
OpenShift Merge Robot
2023-01-05 10:43:59 -05:00
committed by GitHub
parent 9ad538922d a598b73105
commit 0608f55e91
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -368,7 +368,7 @@ osx_alt_build_task:
TEST_FLAVOR: "altbuild" TEST_FLAVOR: "altbuild"
ALT_NAME: 'OSX Cross' ALT_NAME: 'OSX Cross'
osx_instance: osx_instance:
image: 'big-sur-base' image: ghcr.io/cirruslabs/macos-ventura-base:latest
setup_script: setup_script:
- brew install go - brew install go
- brew install go-md2man - brew install go-md2man

4
Makefile
View File

@ -256,8 +256,10 @@ volume-plugin-test-img:
test/goecho/goecho: $(wildcard test/goecho/*.go) test/goecho/goecho: $(wildcard test/goecho/*.go)
$(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/goecho $(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 test/version/version: version/version.go
$(GO) build -o $@ ./test/version/ GOARCH=$(NATIVE_GOARCH) $(GO) build -o $@ ./test/version/
.PHONY: codespell .PHONY: codespell
codespell: codespell: