Update bosh-cli to 6.1.0, remove develop branch code from build script

cjnosal · Sep 19, 2019 · b3b6683 · b3b6683
1 parent 787191a
commit b3b6683
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 21 deletions.
diff --git a/README.md b/README.md
@@ -148,8 +148,7 @@ If multiple independant libraries are provided to the CLI all scenario names
 should be unambiguous.
 
 # build
-`./scripts/build.sh [--setup]`
-- `--setup` will `go get` required branches of forked dependencies
+`./scripts/build.sh`
 
 # test
 `./scripts/test.sh [go test flags]`

diff --git a/go.mod b/go.mod
@@ -7,7 +7,7 @@ require (
 	github.com/bmatcuk/doublestar v1.1.5 // indirect
 	github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 // indirect
 	github.com/cheggaaa/pb v0.0.0-20190702094313-40231cf7fa00 // indirect
-	github.com/cloudfoundry/bosh-cli v6.0.1-0.20190829021415-fe482f05bc5a+incompatible
+	github.com/cloudfoundry/bosh-cli v6.1.0+incompatible
 	github.com/cloudfoundry/bosh-utils v0.0.0-20190824100155-2bd955afd080 // indirect
 	github.com/cloudfoundry/config-server v0.1.19 // indirect
 	github.com/cloudfoundry/go-socks5 v0.0.0-20180221174514-54f73bdb8a8e // indirect

diff --git a/go.sum b/go.sum
@@ -6,8 +6,8 @@ github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1 h1:vTlpHKxJqykyKdW
 github.com/charlievieth/fs v0.0.0-20170613215519-7dc373669fa1/go.mod h1:sAoA1zHCH4FJPE2gne5iBiiVG66U7Nyp6JqlOo+FEyg=
 github.com/cheggaaa/pb v0.0.0-20190702094313-40231cf7fa00 h1:fmupE17SYhqHnBdF84H3yQZakdgOXsCUM2ncQFhC5Xc=
 github.com/cheggaaa/pb v0.0.0-20190702094313-40231cf7fa00/go.mod h1:PBkXrnkhxrT3qj4OESIfx9o/zmjrmFkc9yeqFYw9jq4=
-github.com/cloudfoundry/bosh-cli v6.0.1-0.20190829021415-fe482f05bc5a+incompatible h1:gR1q3+TP/8fISOEnXu3bgDUiE4dfG2aGJPxzRQctaXo=
-github.com/cloudfoundry/bosh-cli v6.0.1-0.20190829021415-fe482f05bc5a+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM=
+github.com/cloudfoundry/bosh-cli v6.1.0+incompatible h1:PQztH35vN+BpA9HbhIiUUZJNvdTNjLpsPR5T8KyH+D0=
+github.com/cloudfoundry/bosh-cli v6.1.0+incompatible/go.mod h1:rzIB+e1sn7wQL/TJ54bl/FemPKRhXby5BIMS3tLuWFM=
 github.com/cloudfoundry/bosh-utils v0.0.0-20190824100155-2bd955afd080 h1:ArMWvHp2Rt7mYhlPZEJLvxvxXQX3GCk358BpNQAOYAM=
 github.com/cloudfoundry/bosh-utils v0.0.0-20190824100155-2bd955afd080/go.mod h1:JCrKwetZGjxbfq1U139TZuXDBfdGLtjOEAfxMWKV/QM=
 github.com/cloudfoundry/config-server v0.1.19 h1:ovpA8kUZ/8Xzcn4DpZ6psTkf+5yWH43+imLSCGxxp2Y=

diff --git a/scripts/build.sh b/scripts/build.sh
@@ -1,25 +1,9 @@
 #!/bin/bash
 
-SETUP=$1
 pushd `dirname $0`/.. > /dev/null
 
-boshrepo=github.com/cloudfoundry/bosh-cli
-boshbranch=develop
-
-function setup() {
-	go get $boshrepo@$boshbranch
-}
-
 go fmt ./...
 
-# if packages are missing or --setup requested, go get required branches of forked repos
-go list $boshrepo >/dev/null 2>&1
-MISSING=$?
-if [[ $SETUP == "--setup" || $MISSING != 0 ]]
-then
-	setup
-fi
-
 go build -o ./manifer -i ./cmd/manifer
 result=$?