From 02b46e6a9640ac978a33e50008d605d392195ccc Mon Sep 17 00:00:00 2001 From: MichaelOultram Date: Wed, 12 Aug 2015 21:44:04 +0100 Subject: [PATCH] Changed how things are cached on circleci --- circle.yml | 4 +++- install-dependencies.sh | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/circle.yml b/circle.yml index 203f232..26bda34 100644 --- a/circle.yml +++ b/circle.yml @@ -15,7 +15,9 @@ dependencies: - "~/opus" - "~/bin" - "~/.vendor" - - "$(GOPATH)/src/github.com/nitrous-io" + - "/home/ubuntu/.go_workspace/bin" + - "/home/ubuntu/.go_workspace/pkg" + - "/home/ubuntu/.go_workspace/src/github.com/nitrous-io" test: override: - mumbledj -server=$MUMBLE_IP -port=$MUMBLE_PORT -username=circleci -password=$MUMBLE_PASSWORD -verbose=true -test=true: diff --git a/install-dependencies.sh b/install-dependencies.sh index 63668b9..a03870b 100644 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -1,9 +1,6 @@ #!/bin/sh set -e -echo "Gopath: $GOPATH" -ls -lR $GOPATH - # check to see if ffmpeg is installed if [ ! -f "$HOME/bin/ffmpeg" ]; then echo 'Installing ffmpeg' @@ -32,13 +29,4 @@ if [ ! -f "$HOME/bin/youtube-dl" ]; then chmod a+rx ~/bin/youtube-dl else echo 'Using cached version of youtube-dl.'; -fi - -# check to see if goop is installed -if [ ! -f "$HOME/bin/goop" ]; then - echo 'Installing goop' - go get github.com/nitrous-io/goop - mv "/usr/local/bin/goop" "~/bin/goop" -else - echo 'Using cached version of goop.'; fi \ No newline at end of file