Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove vendored modules in favour of go mod. #951

Merged
merged 1 commit into from
Sep 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ RUN cd /usr/local/bin && unzip vault_${vault_version}_linux_amd64.zip
RUN apk update && apk add --no-cache git
WORKDIR /src
COPY . .
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test -mod=vendor -trimpath -ldflags "-s -w" ./...
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -mod=vendor -trimpath -ldflags "-s -w"
RUN go mod tidy
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go test -trimpath -ldflags "-s -w" ./...
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -trimpath -ldflags "-s -w"

FROM alpine:3.16
RUN apk update && apk add --no-cache ca-certificates
Expand Down
5 changes: 2 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ VERSION ?= $(shell git describe --tags --first-parent --abbrev=0 | cut -c 2-)


# GOFLAGS is the flags for the go compiler.
GOFLAGS ?= -mod=vendor -ldflags "-X main.version=$(CUR_TAG)"
GOFLAGS ?= -ldflags "-X main.version=$(CUR_TAG)"

# GOVERSION is the current go version, e.g. go1.9.2
GOVERSION ?= $(shell go version | awk '{print $$3;}')
Expand Down Expand Up @@ -64,12 +64,11 @@ test: build
.PHONY: mod
mod:
go mod tidy
go mod vendor

# gofmt runs gofmt on the code
.PHONY: gofmt
gofmt:
gofmt -s -w `find . -type f -name '*.go' | grep -v vendor`
gofmt -s -w `find . -type f -name '*.go'`


beta: $(BETA_OSES)
Expand Down
27 changes: 0 additions & 27 deletions vendor/github.com/Shopify/sarama/.gitignore

This file was deleted.

36 changes: 0 additions & 36 deletions vendor/github.com/Shopify/sarama/.travis.yml

This file was deleted.

Loading
Loading