From 169fe8e8863a133cae54e385618a0eabf59c6c1c Mon Sep 17 00:00:00 2001 From: Kingdon Barrett Date: Mon, 21 Feb 2022 15:46:08 -0500 Subject: [PATCH] required upgrade for circleci We are deprecating Ubuntu 16.04-based machine images on CircleCI in preparation for an EOL on Tuesday, May 31 Signed-off-by: Kingdon Barrett --- .circleci/config.yml | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1496a1d19..fb9f57d34 100644 --- 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 index 99c255a03..bc8cd2043 100644 --- 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))