Merge pull request #1454 from mtrmac/1.4-pin-go

[release-1.4] pin go
This commit is contained in:
Daniel J Walsh
2021-09-20 14:31:12 -04:00
committed by GitHub

View File

@@ -84,18 +84,19 @@ doccheck_task:
"${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck
osx_task: osx_task:
only_if: $CI != $CI only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
depends_on: depends_on:
- validate - validate
macos_instance: macos_instance:
image: catalina-xcode image: catalina-xcode
setup_script: | setup_script: |
export PATH=$GOPATH/bin:$PATH # /usr/local/opt/go@1.16 will be populated by (brew install go@1.16) below
export PATH=$GOPATH/bin:/usr/local/opt/go@1.16/bin:$PATH
brew update brew update
brew install gpgme go go-md2man brew install gpgme go@1.16 go-md2man
go get -u golang.org/x/lint/golint go get -u golang.org/x/lint/golint
test_script: | test_script: |
export PATH=$GOPATH/bin:$PATH export PATH=$GOPATH/bin:/usr/local/opt/go@1.16/bin:$PATH
go version go version
go env go env
make validate-local test-unit-local bin/skopeo make validate-local test-unit-local bin/skopeo
@@ -105,7 +106,7 @@ osx_task:
cross_task: cross_task:
alias: cross alias: cross
only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' only_if: *not_docs
depends_on: depends_on:
- validate - validate
gce_instance: gce_instance: