Skip to content

Commit

Permalink
Merge pull request #900 from cloudskiff/fix/remove_mod_download
Browse files Browse the repository at this point in the history
remove useless go mod download from make test
  • Loading branch information
moadibfr committed Jul 30, 2021
2 parents 261bf01 + a092994 commit b734f7c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 287 deletions.
2 changes: 0 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ jobs:
version: "1.16.2"
# Disable cache at it seem to broke go 1.16 installation
cache: false
- run: make deps
- run: make install-tools
- run:
name: Run acceptance tests
Expand Down Expand Up @@ -51,7 +50,6 @@ jobs:
exit 1
fi
- run: make install-tools
- run: make deps
- run: make lint
test:
docker:
Expand Down
10 changes: 3 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ ACC_PATTERN ?= TestAcc_
.PHONY: FORCE

.PHONY: all
all: fmt lint test build
all: fmt lint test build go.mod

.PHONY: build
build:
Expand All @@ -28,7 +28,7 @@ release:
ENV=release ./scripts/build.sh

.PHONY: test
test: deps
test:
$(GOTEST) --format testname --junitfile unit-tests.xml -- -mod=readonly -coverprofile=cover.out.tmp -coverpkg=.,./pkg/... ./...
cat cover.out.tmp | grep -v "mock_" > cover.out

Expand All @@ -41,7 +41,7 @@ acc:
DRIFTCTL_ACC=true $(GOTEST) --format testname --junitfile unit-tests-acc.xml -- -coverprofile=cover-acc.out -test.timeout 2h -coverpkg=./pkg/... -run=$(ACC_PATTERN) ./pkg/...

.PHONY: mocks
mocks: deps
mocks:
rm -rf mocks
mockery --all

Expand All @@ -60,10 +60,6 @@ lint:
@which golangci-lint > /dev/null 2>&1 || (curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | bash -s -- -b $(GOBINPATH) v1.31.0)
golangci-lint run -v --timeout=10m

.PHONY: deps
deps:
$(GOMOD) download

.PHONY: install-tools
install-tools:
$(GOINSTALL) gotest.tools/gotestsum@v1.6.3
Expand Down

0 comments on commit b734f7c

Please sign in to comment.