diff options
author | Nick Thomas <nick@gitlab.com> | 2017-09-22 16:35:01 +0300 |
---|---|---|
committer | Nick Thomas <nick@gitlab.com> | 2017-09-29 15:04:49 +0300 |
commit | d4aa227433be1b4c415ad8e70f5123b81a496360 (patch) | |
tree | e4a38cd7c6ee3fb64208fb53fb815dfc678d9a98 /.gitlab-ci.yml | |
parent | d5360efc31b0c6b02ed17f77087226bba3916e36 (diff) |
Rework the Makefile so "make" runs outside a GOPATH. Update CI to suit
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r-- | .gitlab-ci.yml | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38084c3e..9b75c6ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,18 +1,15 @@ image: golang:1.8 -# Put the go sources in GOPATH -# This is required to make the vendor working -before_script: -- GODIR=$GOPATH/src/gitlab.com/gitlab-org/gitlab-pages -- mkdir -p "$(dirname "$GODIR")" -- ln -sfv "$(pwd -P)" "$GODIR" -- cd "$GODIR" - .test: &test script: + - make setup - make verify - - make acceptance - + - make cover + - make test + artifacts: + paths: + - bin/gitlab-pages + - coverage.html test:1.8: <<: *test @@ -20,4 +17,3 @@ test:1.8: test:1.9: image: golang:1.9 <<: *test -
\ No newline at end of file |