.gitlab-ci.yml: use ci/run and switch to GOPATH-less build

The ca-certificates package is required for connections to
proxy.golang.org

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6442ec4a4592a6095b8f0e3da12a2eb0311fd318..c43c98351cffaa8043979af139df2a1e8fc637d4 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,14 @@
 .template-docker: &template-docker
   before_script:
     - apt-get update
-    - apt-get install --no-install-recommends --yes golang golang-golang-x-tools golang-github-pkg-errors-dev golang-github-burntsushi-toml-dev build-essential clang git
+    - apt-get install --no-install-recommends --yes golang golang-golang-x-tools build-essential clang git ca-certificates
   script:
-    - 'test -z "$GOPATH" && export GOPATH=/usr/share/gocode'
     # Run as user nobody so CAP_DAC_OVERRIDE is dropped and the tests can
     # chmod a file 0000 to force "permission denied" errors.
     - export HOME=/tmp # writable by nobody
     - chown -R nobody .
     # Empty TEST_* as -fsanitize doesn't work in a Docker container
-    - runuser -p -u nobody -- make      TEST_CFLAGS= TEST_LDFLAGS=
-    - runuser -p -u nobody -- make test TEST_CFLAGS= TEST_LDFLAGS=
-    - 'test -z "$(git clean -nd)"' # any untracked files left?
-    - runuser -p -u nobody -- make clean
-    - 'test -z "$(git clean -ndx)"' # any unignored files left?
-    # Build with clang
-    - runuser -p -u nobody -- make      CC=clang TEST_CFLAGS= TEST_LDFLAGS=
-    - runuser -p -u nobody -- make test CC=clang TEST_CFLAGS= TEST_LDFLAGS=
+    - runuser -p -u nobody -- ./ci/run TEST_CFLAGS= TEST_LDFLAGS=
 
 debian-stable:
   <<: *template-docker

diff --git a/ci/run b/ci/run
index 72170679799029c698dd42191a87584d9478fc61..d4bd6f503da727c29d9b4a1271287daaa49f0c18 100755 (executable)
--- a/ci/run
+++ b/ci/run
@@ -4,13 +4,18 @@ set -eu
 set -x
 
 
-make
-make test
+flags=
+if test $# -ne 0; then
+    flags="$*"
+fi
+
+make      $flags
+make test $flags
 
 test -z "$(git clean -nd)" # any untracked files left?
 make clean
 test -z "$(git clean -ndx)" # any unignored files left?
 
 # Build with clang
-make      CC=clang
-make test CC=clang
+make      CC=clang $flags
+make test CC=clang $flags