Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix make vendor #4208

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

Merged
openshift-merge-robot merged 5 commits into from
Sep 29, 2020
Merged

Fix make vendor #4208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
012e52d
Makefile: fix vendor target
kolyshkin Sep 16, 2020
8eb6575
CONTRIBUTING: no need to set GO111MODULE
kolyshkin Sep 17, 2020
6445c14
Makefile: rm GO111MODULE=on and -mod=vendor
kolyshkin Sep 17, 2020
309b3d0
contrib/test/ci/cri-o.spec: rm GO111MODULE=off
kolyshkin Sep 17, 2020
1a35fce
go.mod/sum: update
kolyshkin Sep 17, 2020
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
11 changes: 5 additions & 6 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,10 @@ Some maintainers add themselves to [`CODEOWNERS`](.github/CODEOWNERS) to manage

### Dependency management

In order to add or update a dependency to this project run:
In order to add or update a dependency to this project, run:

```
> export GO111MODULE=on
> go get -u [DEPENDENCY]
```console
$ go get -u [DEPENDENCY]
```

Since CRI-O uses go modules we highly recommend reading the [go modules
Expand All @@ -85,8 +84,8 @@ section](https://github.com/golang/go/wiki/Modules#daily-workflow).

To ensure the working directory contains all necessary files afterwards, run:

```
> make vendor
```console
$ make vendor
```

### Sign your PRs
Expand Down
13 changes: 6 additions & 7 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ GO ?= go
export GOPROXY=https://proxy.golang.org
export GOSUMDB=https://sum.golang.org

GO_MOD_VENDOR ?= --mod=vendor
GO_BUILD ?= GO111MODULE=on $(GO) build $(GO_MOD_VENDOR)
GO_RUN ?= GO111MODULE=on $(GO) run $(GO_MOD_VENDOR)
GO_BUILD ?= $(GO) build
GO_RUN ?= $(GO) run

PROJECT := github.com/cri-o/cri-o
CRIO_INSTANCE := crio_dev
Expand Down Expand Up @@ -295,11 +294,11 @@ ${SHELLCHECK}:
curl -sfL $$URL | tar xfJ - -C ${BUILD_BIN_PATH} --strip 1 shellcheck-$$VERSION/shellcheck && \
sha256sum ${SHELLCHECK} | grep -q $$SHA256SUM

vendor: export GOSUMDB := ""
vendor:
export GO111MODULE=on GOSUMDB= \
$(GO) mod tidy && \
$(GO) mod vendor && \
$(GO) mod verify
$(GO) mod tidy
$(GO) mod vendor
$(GO) mod verify

testunit: ${GINKGO}
rm -rf ${COVERAGE_PATH} && mkdir -p ${COVERAGE_PATH}
Expand Down
2 changes: 0 additions & 2 deletions contrib/test/ci/cri-o.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@ popd
ln -s vendor src
export GOPATH=$(pwd)/_output:$(pwd)
export BUILDTAGS="selinux seccomp exclude_graphdriver_devicemapper exclude_graphdriver_btrfs containers_image_ostree_stub"
# build crio, crio-status, and pinns
export GO111MODULE=off
make bin/crio bin/crio-status bin/pinns

# build docs
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,9 @@ require (
)

replace (
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc90
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v1.0.3-0.20200710190001-3e4195d92445
github.com/golang/protobuf => github.com/golang/protobuf v1.3.5
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20200117163144-32f20d992d24
google.golang.org/grpc => google.golang.org/grpc v1.27.0
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20200826142205-e19964183377
Expand Down
Loading