Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Required upgrade for circleci #3596

Merged
merged 1 commit into from
Mar 29, 2022
Merged

Required upgrade for circleci #3596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"It's probably a simple one-line change"

^ Me, three weeks ago. (Yes it was! But how does one know which line needs to change? The error was: https://app.circleci.com/pipelines/github/fluxcd/flux/976/workflows/dd384c61-c331-4a9b-9154-d3ea5dd872af/jobs/11947?invite=true#step-107-132

Makefile:40: *** target pattern contains no '%'.  Stop.

FFS... I think we might want to consider again modernizing the CircleCI / moving off and adopting GitHub Actions for Flux v1, as originally proposed in #2944, now that I am more familiar with our build tooling and with GitHub Actions, I could consider reopening that issue here.)

Not today, this one-line kludge means we can keep using it for now.


MAIN_GO_MODULE:=$(shell go list -m -f '{{ .Path }}')
LOCAL_GO_MODULES:=$(shell go list -m -f '{{ .Path }}' all | grep $(MAIN_GO_MODULE))
Expand Down