Skip to content

Compile code in vendor dir; don't download modules again #2267

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.

Sign up for GitHub

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

Closed
wants to merge 1 commit into from
Closed

Compile code in vendor dir; don't download modules again #2267

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
4 changes: 1 addition & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,6 @@ jobs:
machine:
image: ubuntu-1604:201903-01

# Make sure the working directory is within the GOPATH, otherwise
# "go test" will not download module dependencies.
working_directory: ~/.go_workspace/src/github.com/cortexproject/cortex
steps:
- run:
Expand Down Expand Up @@ -155,7 +153,7 @@ jobs:
export CORTEX_IMAGE="${CORTEX_IMAGE_PREFIX}cortex:${CIRCLE_TAG:-$(./tools/image-tag)}"
export CORTEX_CHECKOUT_DIR="/home/circleci/.go_workspace/src/github.com/cortexproject/cortex"
echo "Running integration tests with image: $CORTEX_IMAGE"
go test -tags=requires_docker -timeout 300s -v -count=1 ./integration/...
go test -mod=vendor -tags=requires_docker -timeout 300s -v -count=1 ./integration/...

build:
<<: *defaults
Expand Down
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ RM := --rm
# as it currently disallows TTY devices. This value needs to be overridden
# in any custom cloudbuild.yaml files
TTY := --tty
GO_FLAGS := -ldflags "-extldflags \"-static\" -s -w" -tags netgo
GO_FLAGS := -mod=vendor -ldflags "-extldflags \"-static\" -s -w" -tags netgo

ifeq ($(BUILD_IN_CONTAINER),true)

Expand Down Expand Up @@ -162,7 +162,7 @@ endif
clean:
$(SUDO) docker rmi $(IMAGE_NAMES) >/dev/null 2>&1 || true
rm -rf $(UPTODATE_FILES) $(EXES) .cache
go clean ./...
go clean -mod=vendor ./...

clean-protos:
rm -rf $(PROTO_GOS)
Expand Down
2 changes: 1 addition & 1 deletion tools/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ while [ $# -gt 0 ]; do
esac
done

GO_TEST_ARGS=(-tags "${TAGS[@]}" -cpu 4 -timeout $TIMEOUT $VERBOSE)
GO_TEST_ARGS=(-tags "${TAGS[@]}" -mod=vendor -cpu 4 -timeout $TIMEOUT $VERBOSE)

if [ -n "$SLOW" ] || [ -n "$CIRCLECI" ]; then
SLOW=true
Expand Down