From: Simon Ruderich <simon@ruderich.org>
Date: Tue, 7 Dec 2021 09:24:39 +0000 (+0100)
Subject: ci: fix Gitlab-CI build with recent Sid versions
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=f87d8434fcbae068d7fccab047d95948d12ec549;p=safcm%2Fsafcm.git

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 a3b7c4d..aee2114 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,13 @@
 .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
-    # 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