Skip to content

Commit

Permalink
doc: remove mentions of dep; mention go mod
Browse files Browse the repository at this point in the history
Signed-off-by: Chris Koch <chrisko@google.com>
  • Loading branch information
hugelgupf committed Sep 16, 2020
1 parent 1838a47 commit 67c6ee8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
6 changes: 4 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ Fork the project on GitHub, work in your fork and in branches, push
these to your GitHub fork, and when ready, do a GitHub pull requests
against https://github.com/u-root/u-root.

`u-root` uses [dep](https://github.com/golang/dep)
for its dependency management. Please run `dep ensure`, `dep prune`, and commit Gopkg.toml, Gopkg.lock and vendor/ changes before opening a pull request.
u-root uses Go modules for its dependency management, but still vendors
dependencies in the repository pending module support in the build system.
Please run `go mod tidy` and `go mod vendor` and commit `go.mod`, `go.sum`, and
`vendor/` changes before opening a pull request.

Every commit in your pull request needs to be able to build and pass the CI tests.

Expand Down
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ u-root embodies four different projects.
# Usage

Make sure your Go version is 1.13. Make sure your `GOPATH` is set up correctly.
While u-root uses Go modules, it still vendors dependencies and builds with
`GO111MODULE=off`.

Download and install u-root:

Expand Down Expand Up @@ -377,9 +379,9 @@ u-root can create an initramfs in two different modes:
## Updating Dependencies

```shell
# The latest released version of dep is required:
curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep ensure
go get -u
go mod tidy
go mod vendor
```

# Hardware
Expand Down

0 comments on commit 67c6ee8

Please sign in to comment.