X-Git-Url: https://ruderich.org/simon/gitweb/?p=nsscash%2Fnsscash.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=c43c98351cffaa8043979af139df2a1e8fc637d4;hp=6442ec4a4592a6095b8f0e3da12a2eb0311fd318;hb=4403833dcfc3d296dd9664b1752f722e5f64a275;hpb=e9cde5247dbdf34b9648fa7e755564d74cff8a64

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6442ec4..c43c983 100644
--- 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