From d2add6d52386faa801875a9d32bdf52493d99037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Mon, 15 Aug 2022 15:12:24 +0200 Subject: [PATCH] Pin Go to 1.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.19 has changed the expected gofmt format, and we don't want to follow such changes on the stable branch. go@1.18 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 6b05cbe0..7129997e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -87,12 +87,13 @@ osx_task: macos_instance: image: catalina-xcode setup_script: | - export PATH=$GOPATH/bin:$PATH + # /usr/local/opt/go@1.18 will be populated by (brew install go@1.18) below + export PATH=$GOPATH/bin:/usr/local/opt/go@1.18/bin:$PATH brew update - brew install gpgme go go-md2man + brew install gpgme go@1.18 go-md2man go install golang.org/x/lint/golint@latest test_script: | - export PATH=$GOPATH/bin:$PATH + export PATH=$GOPATH/bin:/usr/local/opt/go@1.18/bin:$PATH go version go env make validate-local test-unit-local bin/skopeo