From d6a0f6308e16b3eb0905315a76c25abf30f459ed Mon Sep 17 00:00:00 2001 From: ValarDragon Date: Sat, 25 Aug 2018 16:44:27 -0700 Subject: [PATCH 1/3] CI: Make CI not update the lock file We want CI to be running the lock in the repo, not generating a new one. Linting now ensures that the lock file is up to date. --- .circleci/config.yml | 18 +++++++++--------- Makefile | 5 +++++ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 269d4ca94be1..b4c4a320d418 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: name: binaries command: | @@ -51,7 +51,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: name: Get metalinter command: | @@ -74,7 +74,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: name: Test cli command: | @@ -93,7 +93,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: name: Test individual module simulations command: | @@ -111,7 +111,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: name: Test individual module simulations command: | @@ -129,7 +129,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: name: Test full Gaia simulation command: | @@ -147,7 +147,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: mkdir -p /tmp/logs - run: name: Run tests @@ -176,7 +176,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps + make get_vendor_deps_ci - run: name: gather command: | @@ -207,7 +207,7 @@ jobs: command: | set -x make get_tools - make get_vendor_deps + make get_vendor_deps_ci make build-linux make localnet-start ./scripts/localnet-blocks-test.sh 40 5 10 localhost diff --git a/Makefile b/Makefile index 66d566309288..690714eee9de 100644 --- a/Makefile +++ b/Makefile @@ -110,6 +110,11 @@ get_vendor_deps: @rm -rf .vendor-new @dep ensure -v +get_vendor_deps_ci: + @echo "--> Running dep ensure" + @rm -rf .vendor-new + @dep ensure -v -vendor-only + draw_deps: @# requires brew install graphviz or apt-get install graphviz go get github.com/RobotsAndPencils/goviz From a65742d15bd5c57b61aed77fdab1b8521f76a9c9 Mon Sep 17 00:00:00 2001 From: ValarDragon Date: Mon, 27 Aug 2018 10:59:54 -0700 Subject: [PATCH 2/3] Switch to Chris' comment --- .circleci/config.yml | 18 +++++++++--------- Makefile | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b4c4a320d418..269d4ca94be1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -27,7 +27,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: name: binaries command: | @@ -51,7 +51,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: name: Get metalinter command: | @@ -74,7 +74,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: name: Test cli command: | @@ -93,7 +93,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: name: Test individual module simulations command: | @@ -111,7 +111,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: name: Test individual module simulations command: | @@ -129,7 +129,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: name: Test full Gaia simulation command: | @@ -147,7 +147,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: mkdir -p /tmp/logs - run: name: Run tests @@ -176,7 +176,7 @@ jobs: name: dependencies command: | export PATH="$GOBIN:$PATH" - make get_vendor_deps_ci + make get_vendor_deps - run: name: gather command: | @@ -207,7 +207,7 @@ jobs: command: | set -x make get_tools - make get_vendor_deps_ci + make get_vendor_deps make build-linux make localnet-start ./scripts/localnet-blocks-test.sh 40 5 10 localhost diff --git a/Makefile b/Makefile index 690714eee9de..983234dbc3c8 100644 --- a/Makefile +++ b/Makefile @@ -106,14 +106,14 @@ get_dev_tools: cd tools && $(MAKE) get_dev_tools get_vendor_deps: - @echo "--> Running dep ensure" + @echo "--> Generating vendor directory via dep ensure" @rm -rf .vendor-new - @dep ensure -v + @dep ensure -v -vendor-only -get_vendor_deps_ci: +update_vendor_deps: @echo "--> Running dep ensure" @rm -rf .vendor-new - @dep ensure -v -vendor-only + @dep ensure -v draw_deps: @# requires brew install graphviz or apt-get install graphviz From 4c7441af103462f44b1b10e9f03b0f72a0a5f55b Mon Sep 17 00:00:00 2001 From: ValarDragon Date: Mon, 27 Aug 2018 11:02:11 -0700 Subject: [PATCH 3/3] Update pending to indicate this new command --- PENDING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/PENDING.md b/PENDING.md index 46e861013baa..eb19defa89b9 100644 --- a/PENDING.md +++ b/PENDING.md @@ -12,6 +12,7 @@ BREAKING CHANGES * [cli] \#1983 you can now pass --pubkey or --address to gaiacli keys show to return a plaintext representation of the key's address or public key for use with other commands * [cli] \#2061 changed proposalID in governance REST endpoints to proposal-id * [cli] \#2014 `gaiacli advanced` no longer exists - to access `ibc`, `rest-server`, and `validator-set` commands use `gaiacli ibc`, `gaiacli rest-server`, and `gaiacli tendermint`, respectively + * [makefile] `get_vendor_deps` no longer updates lock file it just updates vendor directory. Use `update_vendor_deps` to update the lock file. [#2152](https://github.com/cosmos/cosmos-sdk/pull/2152) * Gaia * Make the transient store key use a distinct store key. [#2013](https://github.com/cosmos/cosmos-sdk/pull/2013)