Skip to content

Commit

Permalink
Remove vendor/ (RELENG-355) (#11544)
Browse files Browse the repository at this point in the history
  • Loading branch information
samsalisbury committed Jun 11, 2021
1 parent dce9827 commit e2bb4d0
Show file tree
Hide file tree
Showing 10,477 changed files with 587 additions and 3,276,669 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
362 changes: 184 additions & 178 deletions .circleci/config.yml

Large diffs are not rendered by default.

307 changes: 179 additions & 128 deletions .circleci/config/@build-release.yml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .circleci/config/commands/go_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ steps:
docker cp $DOCKER_CERT_PATH/ testcontainer:$DOCKER_CERT_PATH
docker exec -w /go/src/github.com/hashicorp/vault/ \
-e GO111MODULE -e CIRCLECI -e GOCACHE=/tmp/gocache -e VAULT_CI_GO_TEST_RACE \
-e CIRCLECI -e GOCACHE=/tmp/gocache -e VAULT_CI_GO_TEST_RACE \
-e VAULT_LICENSE_CI \
testcontainer \
gotestsum --format=short-verbose \
Expand Down
4 changes: 0 additions & 4 deletions .circleci/config/executors/@executors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ go-machine:
machine: true
shell: /usr/bin/env bash -euo pipefail -c
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.16.5 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.5.2 # Pin gotestsum to patch version (ex: 1.2.3)
Expand All @@ -28,7 +27,6 @@ docker-env-go-test-remote-docker:
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.5-buster"
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
Expand All @@ -37,7 +35,6 @@ docker-env-go-test:
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.5-buster"
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
Expand All @@ -46,7 +43,6 @@ docker-env-go-test-race:
docker:
- image: "docker.mirror.hashicorp.services/circleci/golang:1.16.5-buster"
environment:
GO111MODULE: "off"
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_TAGS: ""
working_directory: /go/src/github.com/hashicorp/vault
11 changes: 0 additions & 11 deletions .circleci/config/jobs/go-mod-vendor.yml

This file was deleted.

3 changes: 0 additions & 3 deletions .circleci/config/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ jobs:
- build-go-dev:
requires:
- pre-flight-checks
- go-mod-vendor:
requires:
- pre-flight-checks
- test-ui:
requires:
- install-ui-dependencies
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ bootstrap: ci-bootstrap
# Note: if you have plugins in GOPATH you can update all of them via something like:
# for i in $(ls | grep vault-plugin-); do cd $i; git remote update; git reset --hard origin/master; dep ensure -update; git add .; git commit; git push; cd ..; done
update-plugins:
grep vault-plugin- vendor/vendor.json | cut -d '"' -f 4 | xargs govendor fetch
grep vault-plugin- go.mod | cut -d ' ' -f 1 | while read -r P; do echo "Updating $P..."; go get -v -u "$P"; done

static-assets-dir:
@mkdir -p ./pkg/web_ui
Expand Down
286 changes: 17 additions & 269 deletions packages-oss.lock/layers/layers.mk

Large diffs are not rendered by default.

2,252 changes: 198 additions & 2,054 deletions packages-oss.lock/pkgs.yml

Large diffs are not rendered by default.

28 changes: 7 additions & 21 deletions packages-oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ inputs:
#
# NOTE: You MUST NOT use single quotes in the build command, because at present we do no escaping.
build-command: VERSION_PKG_PATH=github.com/hashicorp/vault/vendor/github.com/hashicorp/vault/sdk/version;
GO111MODULE=on
go build -v
-tags ui
-ldflags "
Expand Down Expand Up @@ -244,26 +245,11 @@ layers:
RUN go-bindata-assetfs -o bindata_assetfs.go -pkg http -prefix pkg -modtime 1480000000 -tags ui ./pkg/web_ui/...
RUN mkdir -p http && mv bindata_assetfs.go http/
RUN goimports -w http/bindata_assetfs.go
# Up to now, the layers do not vary between packages. This means the layers above
# can be built prior to package builds in order to warm the cache and speed up
# builds.
#
# warm-go-build-vendor-cache does vary based on GOOS, GOARCH and CGO_ENABLED though.
# This means we should cache this in CI per package build.
- name: warm-go-build-vendor-cache
source-include: vendor/
dockerfile: |-
ENV GOOS={{.GOOS}}
ENV GOARCH={{.GOARCH}}
ENV CGO_ENABLED={{.CGO_ENABLED}}
# Try to build vendored packages. We first filter out packages which report
# errors in 'go list', because trying to run go build ./vendor/... fails early
# if we include them. We also don't care about the exit code here, because
# some of the vendored packages may fail to build, but this won't necessarily
# mean that the final package will fail to build, and we will still get a
# usefully warmed cache.
RUN go list -f '{{"{{.ImportPath}}{{if or .Error .DepsErrors}} ERROR{{end}}"}}' ./vendor/... | grep -v ERROR | xargs go build -v || true
- name: go-modules
source-include: "go.mod go.sum */go.mod */go.sum"
dockerfile: |
ENV GO111MODULE=on
RUN go mod download
# The final layer must contain all the source code we've not yet included.
- name: copy-source
source-include: .
source-exclude: vendor/ ui/
source-include: "*.go"
11 changes: 0 additions & 11 deletions vendor/cloud.google.com/go/.gitignore

This file was deleted.

Loading

0 comments on commit e2bb4d0

Please sign in to comment.