ci: fix Gitlab-CI build with recent Sid versions

The package golang-1.16 is no longer available. Sid now uses
golang-1.17, making the old workaround unnecessary.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a3b7c4d1932655d0ce0a094f5061a7080e9ab8dd..aee2114240ae8008ce950f43d96b265c0769b841 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,13 @@
 .template-docker: &template-docker
   before_script:
     - apt-get update
 .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 shellcheck
+    - 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
   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
     #
     - mkdir /run/sshd
     - ./ci/run