Skip to content

Commit

Permalink
Merge pull request #721 from hairyhenderson/unvendoring
Browse files Browse the repository at this point in the history
Removing vendor/ folder
  • Loading branch information
Dave Henderson authored and GitHub committed Jan 16, 2020
2 parents 42bfed3 + 2fbcfc6 commit fa8815e
Show file tree
Hide file tree
Showing 2,256 changed files with 3 additions and 974,974 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ jobs:
runs-on: windows-latest
env:
TMP: D:\tmp
GOFLAGS: -mod=vendor
steps:
- uses: actions/setup-go@v1
with:
Expand Down
1 change: 0 additions & 1 deletion Dockerfile.integration
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ COPY --from=consul /bin/consul /bin/consul
RUN apk add --no-cache make tzdata

WORKDIR /go/src/github.com/hairyhenderson/gomplate/
COPY vendor ./vendor
COPY tests/integration ./tests/integration
COPY Makefile ./Makefile
COPY bin/gomplate_linux-amd64 ./bin/gomplate
Expand Down
8 changes: 3 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ extension = $(patsubst windows,.exe,$(filter windows,$(1)))
GO := go
PKG_NAME := gomplate
PREFIX := .
GOFLAGS := -mod=vendor

ifeq ("$(CI)","true")
LINT_PROCS ?= 1
Expand Down Expand Up @@ -68,7 +67,6 @@ docker-images: gomplate.iid gomplate-slim.iid

$(PREFIX)/bin/$(PKG_NAME)_%: $(shell find $(PREFIX) -type f -name "*.go")
GOOS=$(shell echo $* | cut -f1 -d-) GOARCH=$(shell echo $* | cut -f2 -d- | cut -f1 -d.) CGO_ENABLED=0 \
GOFLAGS=$(GOFLAGS) \
$(GO) build \
-ldflags "-w -s $(COMMIT_FLAG) $(VERSION_FLAG)" \
-o $@ \
Expand All @@ -81,14 +79,14 @@ build: $(PREFIX)/bin/$(PKG_NAME)$(call extension,$(GOOS))

ifeq ($(OS),Windows_NT)
test:
@GOFLAGS=$(GOFLAGS) $(GO) test -v -coverprofile=c.out ./...
$(GO) test -v -coverprofile=c.out ./...
else
test:
@GOFLAGS=$(GOFLAGS) $(GO) test -v -race -coverprofile=c.out ./...
$(GO) test -v -race -coverprofile=c.out ./...
endif

integration: build
@GOFLAGS=$(GOFLAGS) $(GO) test -v -tags=integration \
$(GO) test -v -tags=integration \
./tests/integration

integration.iid: Dockerfile.integration $(PREFIX)/bin/$(PKG_NAME)_linux-amd64$(call extension,$(GOOS))
Expand Down
202 changes: 0 additions & 202 deletions vendor/cloud.google.com/go/LICENSE

This file was deleted.

Loading

0 comments on commit fa8815e

Please sign in to comment.