Merge branch 'deps_yml' into 'master'

No need to pull deps they are in git

See merge request !63
This commit is contained in:
Reed Allman
2017-06-16 15:45:18 -07:00

View File

@@ -5,7 +5,7 @@ cache:
untracked: true untracked: true
stages: stages:
- deps # - deps
- build - build
- test - test
- deploy - deploy
@@ -15,31 +15,31 @@ before_script:
- ln -s `pwd` "${GOPATH}/src/gitlab-odx.oracle.com/odx/" - ln -s `pwd` "${GOPATH}/src/gitlab-odx.oracle.com/odx/"
- cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions" - cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions"
get_deps: # get_deps:
stage: deps # stage: deps
script: # script:
- cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions" # - cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions"
- pwd # - pwd
- go get github.com/Masterminds/glide # - go get github.com/Masterminds/glide
- glide install --strip-vendor # - glide install --strip-vendor
- cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions/fn" # - cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions/fn"
- pwd # - pwd
- glide install --strip-vendor # - glide install --strip-vendor
only: # only:
- master # - master
#
load_deps: # load_deps:
stage: deps # stage: deps
script: # script:
- cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions" # - cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions"
- pwd # - pwd
- ls vendor/github.com/ > /dev/null || which glide || go get github.com/Masterminds/glide # - ls vendor/github.com/ > /dev/null || which glide || go get github.com/Masterminds/glide
- ls vendor/github.com/ > /dev/null || glide install --strip-vendor # - ls vendor/github.com/ > /dev/null || glide install --strip-vendor
- cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions/fn" # - cd "${GOPATH}/src/gitlab-odx.oracle.com/odx/functions/fn"
- pwd # - pwd
- ls vendor/github.com/ > /dev/null || glide install --strip-vendor # - ls vendor/github.com/ > /dev/null || glide install --strip-vendor
except: # except:
- master # - master
build_job: build_job:
stage: build stage: build