Skip to content

Commit

Permalink
Merge pull request #319 from MysteriumNetwork/experiment/glide-to-dep
Browse files Browse the repository at this point in the history
Migration from glide to dep
  • Loading branch information
tadovas committed Aug 28, 2018
2 parents 46f8222 + c031903 commit 806e10b
Show file tree
Hide file tree
Showing 9 changed files with 485 additions and 233 deletions.
8 changes: 2 additions & 6 deletions .travis.yml
Expand Up @@ -6,9 +6,6 @@ go_import_path: github.com/mysterium/node

env:
global:
- CACHE_ROOT_DIR=$HOME/cache
- BUILD_TOOLS_PATH=$CACHE_ROOT_DIR/build_tools
- GLIDE_HOME=$HOME/glide-home
- BUILD_COMMIT=$TRAVIS_COMMIT
- BUILD_BRANCH=$TRAVIS_BRANCH
- BUILD_NUMBER=$TRAVIS_BUILD_NUMBER
Expand All @@ -19,7 +16,6 @@ before_install:

cache:
directories:
- "$CACHE_ROOT_DIR"
- vendor

stages:
Expand All @@ -38,8 +34,8 @@ jobs:
- stage: dep-cache
name: "Vendor update"
script:
- source bin/travis_scripts/ensure_glide.sh $BUILD_TOOLS_PATH "v0.13.1"
- glide "-home" $GLIDE_HOME install
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- dep ensure

# Test stage
- stage: test
Expand Down
13 changes: 6 additions & 7 deletions CONTRIBUTING.md
Expand Up @@ -6,7 +6,7 @@
* **Step 1.** Get project dependencies
```bash
brew install go
brew install glide
brew install dep
brew install openvpn

export GOPATH=~/workspace/go
Expand All @@ -16,7 +16,7 @@ cd $GOPATH/src/github.com/mysterium/node

* **Step 2.** Fetch dependencies
```bash
glide install
dep ensure
```

* **Step 3.** Start localnet infrastructure
Expand Down Expand Up @@ -92,19 +92,18 @@ bin/swagger_serve_doc

* Install project's frozen packages
```bash
glide install
glide install --force
dep ensure
```

* Add new package to project
```bash
glide get --quick github.com/ccding/go-stun
dep ensure -add github.com/ccding/go-stun
```

* Update package in project
```bash
vim glide.yaml
glide update
vim Gopkg.toml
dep ensure
```

## Creating pull request
Expand Down

0 comments on commit 806e10b

Please sign in to comment.