Skip to content

Commit

Permalink
Merge pull request #64 from carlpett/fix-modules
Browse files Browse the repository at this point in the history
Remove vendoring, bump to Go 1.15
  • Loading branch information
carlpett authored Apr 7, 2021
2 parents 5eeb9c8 + 0f0b9f3 commit 20059a3
Show file tree
Hide file tree
Showing 3,020 changed files with 5 additions and 959,936 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
build:
docker:
- image: circleci/golang:1.13
- image: circleci/golang:1.15
working_directory: /go/src/github.com/carlpett/terraform-provider-sops
steps:
- checkout
Expand All @@ -12,7 +12,7 @@ jobs:
path: terraform-provider-sops
release:
docker:
- image: circleci/golang:1.13
- image: circleci/golang:1.15
working_directory: /go/src/github.com/carlpett/terraform-provider-sops
steps:
- checkout
Expand Down
6 changes: 3 additions & 3 deletions GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ default: build

style:
@echo ">> checking code style"
! gofmt -d $(shell find . -path ./vendor -prune -o -name '*.go' -print) | grep '^'
! gofmt -d $(shell find . -name '*.go' -print) | grep '^'

vet:
@echo ">> vetting code"
Expand All @@ -23,12 +23,12 @@ test:

build:
@echo ">> building binaries"
go build -mod=vendor -o terraform-provider-sops
go build -o terraform-provider-sops

crossbuild: $(GOPATH)/bin/gox
@echo ">> cross-building"
gox -arch="$(CROSSBUILD_ARCH)" -os="$(CROSSBUILD_OS)" -osarch="$(addprefix !,$(subst _,/,$(SKIP_OSARCH)))" \
-mod=vendor -output="binaries/$(VERSION)/{{.OS}}_{{.Arch}}/terraform-provider-sops_$(VERSION)"
-output="binaries/$(VERSION)/{{.OS}}_{{.Arch}}/terraform-provider-sops_$(VERSION)"

$(GOPATH)/bin/gox:
# Need to disable modules for this to not pollute go.mod
Expand Down
Loading

0 comments on commit 20059a3

Please sign in to comment.