Skip to content
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

Jump to bottom

replace dep with go mod #3907

Merged
merged 12 commits into from
Mar 18, 2019
Merged

replace dep with go mod #3907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5aa88ce
replace dep with go mod
alessio Mar 14, 2019
3d3f193
Fix small mistake in scripts/Makefile
alessio Mar 17, 2019
c847519
Freeze go-imports, run go install with -mod=readonly
alessio Mar 17, 2019
8cc1ae9
Fix "make: gosum: Command not found"
alessio Mar 17, 2019
492fdc4
Remove -mod=readonly
alessio Mar 17, 2019
f4566f2
Update go.{mod,sum}
alessio Mar 17, 2019
06ba7cb
Update go.sum
alessio Mar 17, 2019
53a13d1
Run go install with -mod=readonly
alessio Mar 17, 2019
5e19b27
Remove unnecessary call to make go-mod-cache
alessio Mar 18, 2019
56c50e2
Update contributors guide
alessio Mar 18, 2019
dbaa2ea
Upgrade to go 1.12
alessio Mar 18, 2019
8ba68a1
Update changelog entry
alessio Mar 18, 2019
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
16 changes: 9 additions & 7 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: 2
defaults: &linux_defaults
working_directory: /go/src/github.com/cosmos/cosmos-sdk
docker:
- image: circleci/golang:1.11.5
- image: circleci/golang:1.12.1
environment:
GOBIN: /tmp/workspace/bin

Expand All @@ -17,7 +17,7 @@ macos_config: &macos_defaults
xcode: "10.1.0"
working_directory: /Users/distiller/project/src/github.com/cosmos/cosmos-sdk
environment:
GO_VERSION: "1.11.5"
GO_VERSION: "1.12.1"

set_macos_env: &macos_env
run:
Expand All @@ -27,6 +27,7 @@ set_macos_env: &macos_env
echo 'export GOPATH=$HOME/project' >> $BASH_ENV
echo 'export GOBIN=$GOPATH/bin' >> $BASH_ENV
echo 'export PATH=$PATH:$HOME/go/bin:$GOBIN' >> $BASH_ENV
echo 'export GO111MODULE=on'
alessio marked this conversation as resolved.
Show resolved Hide resolved

############
#
Expand All @@ -44,7 +45,6 @@ deps: &dependencies
name: dependencies
command: |
export PATH="$GOBIN:$PATH"
make vendor-deps

jobs:
setup_dependencies:
Expand All @@ -63,6 +63,7 @@ jobs:
name: binaries
command: |
export PATH="$GOBIN:$PATH"
make go-mod-cache
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also not a circcleci expert but line 62 reads - *dependencies. And the dependencies anchor is defined by:

deps: &dependencies
  run:
    name: dependencies
    command: |
      export PATH="$GOBIN:$PATH"
      make go-mod-cache

Shouldn't make go-mod-cache already have been called there?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed

make install
- persist_to_workspace:
root: /tmp/workspace
Expand Down Expand Up @@ -172,6 +173,7 @@ jobs:
name: Test multi-seed Gaia simulation long
command: |
export PATH="$GOBIN:$PATH"
export GO111MODULE=on
alessio marked this conversation as resolved.
Show resolved Hide resolved
scripts/multisim.sh 500 50 TestFullGaiaSimulation

test_sim_gaia_multi_seed:
Expand All @@ -186,6 +188,7 @@ jobs:
name: Test multi-seed Gaia simulation short
command: |
export PATH="$GOBIN:$PATH"
export GO111MODULE=on
alessio marked this conversation as resolved.
Show resolved Hide resolved
scripts/multisim.sh 50 10 TestFullGaiaSimulation

test_cover:
Expand All @@ -202,9 +205,10 @@ jobs:
command: |
export PATH="$GOBIN:$PATH"
export VERSION="$(git describe --tags --long | sed 's/v\(.*\)/\1/')"
export GO111MODULE=on
alessio marked this conversation as resolved.
Show resolved Hide resolved
for pkg in $(go list ./... | grep -v github.com/cosmos/cosmos-sdk/cmd/gaia/cli_test | grep -v '/simulation' | circleci tests split --split-by=timings); do
id=$(echo "$pkg" | sed 's|[/.]|_|g')
GOCACHE=off go test -timeout 8m -race -coverprofile=/tmp/workspace/profiles/$id.out -covermode=atomic -tags='ledger test_ledger_mock' "$pkg" | tee "/tmp/logs/$id-$RANDOM.log"
go test -timeout 8m -race -coverprofile=/tmp/workspace/profiles/$id.out -covermode=atomic -tags='ledger test_ledger_mock' "$pkg" | tee "/tmp/logs/$id-$RANDOM.log"
done
- persist_to_workspace:
root: /tmp/workspace
Expand Down Expand Up @@ -253,7 +257,7 @@ jobs:
GOPATH: /home/circleci/.go_workspace/
GOOS: linux
GOARCH: amd64
GO_VERSION: "1.11.5"
GO_VERSION: "1.12.1"
parallelism: 1
steps:
- checkout
Expand All @@ -268,7 +272,6 @@ jobs:
popd
set -x
make tools
make vendor-deps
make build-linux
make localnet-start
./scripts/localnet-blocks-test.sh 40 5 10 localhost
Expand Down Expand Up @@ -315,7 +318,6 @@ jobs:
command: |
source $BASH_ENV
make tools
make vendor-deps
make install
- run:
name: Integration tests
Expand Down
2 changes: 0 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

# Build
vendor
vendor-deps
.vendor-new
build
tools/bin/*
examples/build/*
Expand Down
3 changes: 3 additions & 0 deletions .pending/improvements/sdk/3907-Drop-dep-in-fav
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#3907: dep -> go mod migration
- Drop dep in favor of go modules.
- Upgrade to Go 1.12.1.
18 changes: 6 additions & 12 deletions CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,21 +100,15 @@ Please don't make Pull Requests to `master`.

## Dependencies

We use [dep](https://github.com/golang/dep) to manage dependencies.
We use [Go 1.11 Modules](https://github.com/golang/go/wiki/Modules) to manage
dependency versions.

That said, the master branch of every Cosmos repository should just build
with `go get`, which means they should be kept up-to-date with their
dependencies so we can get away with telling people they can just `go get` our
software.
The master branch of every Cosmos repository should just build with `go get`,
which means they should be kept up-to-date with their dependencies so we can
get away with telling people they can just `go get` our software.

Since some dependencies are not under our control, a third party may break our
build, in which case we can fall back on `dep ensure` (or `make
get_vendor_deps`). Even for dependencies under our control, dep helps us to
keep multiple repos in sync as they evolve. Anything with an executable, such
as apps, tools, and the core, should use dep.

Run `dep status` to get a list of vendor dependencies that may not be
up-to-date.
build, in which case we can fall back on `go mod tidy -v`.

## Testing

Expand Down
2 changes: 0 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ COPY . .
# Install minimum necessary dependencies, build Cosmos SDK, remove packages
RUN apk add --no-cache $PACKAGES && \
make tools && \
make vendor-deps && \
make build && \
make install

# Final image
Expand Down
Loading