Merge pull request #3596 from kingdonb/circleci-upgrade-2

Required upgrade for circleci
fluxcd · Mar 29, 2022 · 96c5d2f · 96c5d2f
2 parents b49ca3e + 169fe8e
commit 96c5d2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: /home/circleci/go/src/github.com/fluxcd/flux
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202010-01
     resource_class: large
     environment:
       GO_VERSION: 1.16.7

diff --git a/Makefile b/Makefile
@@ -22,7 +22,7 @@ ifeq ($(ARCH),)
 endif
 CURRENT_OS=$(shell go env GOOS)
 CURRENT_OS_ARCH=$(shell echo $(CURRENT_OS)-`go env GOARCH`)
-GOBIN?=$(shell echo `go env GOPATH`/bin)
+GOBIN?=$(shell echo `go env GOPATH|cut -d: -f1`/bin)
 
 MAIN_GO_MODULE:=$(shell go list -m -f '{{ .Path }}')
 LOCAL_GO_MODULES:=$(shell go list -m -f '{{ .Path }}' all | grep $(MAIN_GO_MODULE))