X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=.gitlab-ci.yml;h=aee2114240ae8008ce950f43d96b265c0769b841;hb=refs%2Fheads%2Fmaster;hp=e2ec0a52a7582a9265fd431dbf90b2d41bebaabc;hpb=825f928d824f728088606bcbf112d30d7a76f627;p=safcm%2Fsafcm.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2ec0a5..aee2114 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,20 +1,18 @@
 .template-docker: &template-docker
   before_script:
     - apt-get update
-    - apt-get install --no-install-recommends --yes build-essential ca-certificates git golang golang-1.16 golang-golang-x-tools make openssh-server
+    - apt-get install --no-install-recommends --yes build-essential ca-certificates git golang golang-golang-x-tools make openssh-server shellcheck
   script:
     # Gitlab-runner uses umask 0000 (wtf?!) and mixes nobody and root user
     # when setting up the environment. This breaks ssh's permission check on
     # authorized_keys.
     - chown -R root:root /builds
     - chmod -R go-w /builds
-    # NOTE: golang is still using golang-1.15
-    - mkdir -p $HOME/go/bin
-    - ln -sf /usr/lib/go-1.16/bin/go $HOME/go/bin
-    - ln -sf /usr/lib/go-1.16/bin/gofmt $HOME/go/bin
     #
     - mkdir /run/sshd
     - ./ci/run
+    # Windows is not really supported, but at least check building works
+    - PATH=$HOME/go/bin:$PATH make GOOS=windows GOFLAGS=
 
 debian-sid:
   <<: *template-docker