From 3bcdd2b5d6379c765401f172207d29bf4a053ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 20 Sep 2021 15:27:38 +0200 Subject: [PATCH 1/2] Revert "Cirrus: Disable OSX task" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit cd09650375087e98759dad327081d5cfc58a6f9f. Signed-off-by: Miloslav Trmač --- .cirrus.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index d69e7044..87809f6b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -84,7 +84,7 @@ doccheck_task: "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" doccheck osx_task: - only_if: $CI != $CI + only_if: ¬_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' depends_on: - validate macos_instance: @@ -105,7 +105,7 @@ osx_task: cross_task: alias: cross - only_if: ¬_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*' + only_if: *not_docs depends_on: - validate gce_instance: From 1b6d7f79a521bdcf5947f14363211d3d3ca92c99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 20 Sep 2021 15:28:14 +0200 Subject: [PATCH 2/2] Pin Go to 1.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.17 has changed the expected gofmt format, and we don't want to follow such changes on the stable branch. go@1.16 is "keg-only", i.e. not installed by Brew to /usr/local/bin, so we need to change PATH to point at it (as the installation instructs us to). Signed-off-by: Miloslav Trmač --- .cirrus.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 87809f6b..aed53acf 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -90,12 +90,13 @@ osx_task: macos_instance: image: catalina-xcode 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 install gpgme go go-md2man + brew install gpgme go@1.16 go-md2man go get -u golang.org/x/lint/golint test_script: | - export PATH=$GOPATH/bin:$PATH + export PATH=$GOPATH/bin:/usr/local/opt/go@1.16/bin:$PATH go version go env make validate-local test-unit-local bin/skopeo