Skip to content
This repository has been archived by the owner on May 19, 2020. It is now read-only.

Commit

Permalink
Merge pull request #1286 from govau/ji-dep
Browse files Browse the repository at this point in the history
Change from glide to dep
  • Loading branch information
jcscottiii authored Nov 16, 2017
2 parents 8964191 + f215fea commit 6d0c135
Show file tree
Hide file tree
Showing 12 changed files with 317 additions and 17 deletions.
1 change: 0 additions & 1 deletion .cfignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ static/tests/
# only exclude these index.html files from the VNC service.
# they only appear in the root folder.
/index.html*
/.glide*
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,3 @@ context/selenium-logs/selenium-standalone.txt
# only exclude these index.html files from the VNC service.
# they only appear in the root folder.
/index.html*
/.glide*
221 changes: 221 additions & 0 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

81 changes: 81 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@

# Gopkg.toml example
#
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
# for detailed Gopkg.toml documentation.
#
# required = ["github.com/user/thing/cmd/thing"]
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
#
# [[constraint]]
# name = "github.com/user/project"
# version = "1.0.0"
#
# [[constraint]]
# name = "github.com/user/project2"
# branch = "dev"
# source = "github.com/myfork/project2"
#
# [[override]]
# name = "github.com/x/y"
# version = "2.4.0"


[[constraint]]
name = "github.com/boj/redistore"
version = "~1.2.0"

[[constraint]]
name = "github.com/cloudfoundry-community/go-cfenv"

[[constraint]]
name = "github.com/cloudfoundry/loggregatorlib"

[[constraint]]
name = "github.com/fsouza/go-dockerclient"

[[constraint]]
name = "github.com/garyburd/redigo"

[[constraint]]
name = "github.com/gocraft/web"

[[constraint]]
name = "github.com/gogo/protobuf"

[[constraint]]
name = "github.com/gorilla/context"

[[constraint]]
name = "github.com/gorilla/csrf"
version = "~1.4.0"

[[constraint]]
name = "github.com/gorilla/sessions"

[[constraint]]
name = "github.com/govau/cf-common"
version = "0.0.2"

[[constraint]]
name = "github.com/jordan-wright/email"

[[constraint]]
name = "github.com/ory/dockertest"
version = "3.0.7"

[[constraint]]
name = "github.com/satori/go.uuid"
version = "1.1.0"

[[constraint]]
name = "github.com/stretchr/testify"

[[constraint]]
name = "github.com/yvasiyarov/gorelic"

[[constraint]]
name = "golang.org/x/net"

[[constraint]]
name = "golang.org/x/oauth2"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Learn more about [cloud.gov](https://cloud.gov).

### Backend Server

- `Go` (version 1.8)
- `Go` (version 1.9)

### Front end application

Expand Down
6 changes: 3 additions & 3 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ machine:
services:
- docker
environment:
GODIST: "go1.8.linux-amd64.tar.gz"
GODIST: "go1.9.linux-amd64.tar.gz"
WS: "/home/ubuntu/.go_workspace/src/github.com/18F/cg-dashboard"
CF_ORGANIZATION: "cloud-gov"
post:
Expand All @@ -18,10 +18,10 @@ dependencies:
pre:
- sudo apt-get update; sudo apt-get install libicu52
- go version
- go get github.com/Masterminds/glide
- go get -u github.com/golang/dep/cmd/dep
- rm -rf $WS
- mkdir -p $(dirname $WS) && ln -s $(pwd) $WS
- cd $WS && glide install
- cd $WS && dep ensure
- npm install
- npm run test-selenium-install
override:
Expand Down
2 changes: 1 addition & 1 deletion codecheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function testCmdOutput() {
}

# Get the list of packages.
pkgs=`glide novendor -x`
pkgs=`go list ./...`

# Lint check
echo
Expand Down
2 changes: 1 addition & 1 deletion devtools/docker-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ the Dockerfile in the `devtools/node` directory. Then rebuild the image with:
Format: `docker-compose run --rm backend <COMMAND>`

Examples:
- Add dependency: `docker-compose run --rm backend glide get github.com/some/repo`
- Add dependency: `docker-compose run --rm backend dep ensure -add github.com/some/repo`
- Run `./codecheck.sh`: `docker-compose run --rm backend ./codecheck.sh`

#### UAA One-Offs
Expand Down
6 changes: 3 additions & 3 deletions devtools/golang/install_deps_then
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/bin/sh

if [ ! -x $GOPATH/bin/glide ]; then
go get github.com/Masterminds/glide
if [ ! -x $GOPATH/bin/dep ]; then
go get -u github.com/golang/dep/cmd/dep
fi

export PATH=$GOPATH/bin:$PATH
if [ ! -x vendor ]; then
glide install
dep ensure
fi

prgm=$1
Expand Down
6 changes: 3 additions & 3 deletions devtools/manual-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ npm install -g eslint-plugin-react

## Running locally
- Make sure all of your environment variables are set and you are using the Go version as mentioned above.
- Install [glide](https://github.com/Masterminds/glide)
- Run `glide install` to get all third party code
- Install [dep](https://github.com/golang/dep)
- Run `dep ensure` to get all third party code
- `go run server.go`
- Navigate browser to [`http://localhost:9999`](http://localhost:9999)

Expand All @@ -110,7 +110,7 @@ To kill that process, run `kill %N` where "N" is the number from the line.
### Running Go unit tests

```sh
TEST_ROOT_PATH=`pwd` go test $(glide nv)
TEST_ROOT_PATH=`pwd` go test ./...
```

### Running Javascript unit tests
Expand Down
Loading

0 comments on commit 6d0c135

Please sign in to comment.