From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Fri, 7 Oct 2022 13:24:00 +0000 (+0200)
Subject: ci/images/debian-11: drop go
X-Git-Tag: v5.6.0~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6219f3391f21de0c09a8fa47d38a7ae934957fe8;p=thirdparty%2Fknot-resolver.git

ci/images/debian-11: drop go

I don't know how to fix building the image with it.
A few things were tried around different go versions (from -backports).
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 071b33bfe..affeb71d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,7 +99,7 @@ build:
     - meson build_ci --default-library=static --prefix=$PREFIX -Dwerror=true -Dextra_tests=enabled
     - ninja -C build_ci
     - ninja -C build_ci install >/dev/null
-    - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
+    - ${MESON_TEST} --suite unit --suite config --no-suite snowflake
 
 build-knot32:
   <<: *build
@@ -108,7 +108,7 @@ build-knot32:
     - meson build_ci_knot32 --default-library=static --prefix=$PREFIX -Dwerror=true -Dextra_tests=enabled
     - ninja -C build_ci_knot32
     - ninja -C build_ci_knot32 install >/dev/null
-    - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
+    - ${MESON_TEST} --suite unit --suite config --no-suite snowflake
 
 build-asan:
   <<: *build
@@ -119,7 +119,7 @@ build-asan:
     - ninja -C build_ci_asan install >/dev/null
       # TODO _leaks: not sure what exactly is wrong in leak detection on config tests
       # TODO skip_asan: all three of these disappear locally when using gcc 9.1 (except some leaks)
-    - MESON_TESTTHREADS=1 ASAN_OPTIONS=detect_leaks=0 ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite skip_asan --no-suite snowflake
+    - MESON_TESTTHREADS=1 ASAN_OPTIONS=detect_leaks=0 ${MESON_TEST} --suite unit --suite config --no-suite skip_asan --no-suite snowflake
 
 build:macOS:
   <<: *nodep
diff --git a/ci/images/debian-11/Dockerfile b/ci/images/debian-11/Dockerfile
index be22a2ad6..4ed7cff6a 100644
--- a/ci/images/debian-11/Dockerfile
+++ b/ci/images/debian-11/Dockerfile
@@ -21,9 +21,10 @@ RUN apt-get install -y -qqq git make cmake pkg-config meson \
 
 # Build and testing deps for Resolver's dnstap module (go stuff is just for testing)
 RUN apt-get install -y -qqq \
-	protobuf-c-compiler libprotobuf-c-dev libfstrm-dev \
-	golang-any
-RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap,golang/protobuf/proto}"
+	protobuf-c-compiler libprotobuf-c-dev libfstrm-dev
+# Maintaining the go stuff in CI really seems more trouble than worth.
+#	golang-any
+#RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap,golang/protobuf/proto}"
 
 # documentation dependencies
 RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme
diff --git a/ci/images/lxc-debian-11/Dockerfile b/ci/images/lxc-debian-11/Dockerfile
index 663c60947..82b0ad6b3 100644
--- a/ci/images/lxc-debian-11/Dockerfile
+++ b/ci/images/lxc-debian-11/Dockerfile
@@ -18,9 +18,10 @@ RUN apt-get install -y -qqq git make cmake pkg-config meson \
 
 # Build and testing deps for Resolver's dnstap module (go stuff is just for testing)
 RUN apt-get install -y -qqq \
-	protobuf-c-compiler libprotobuf-c-dev libfstrm-dev \
-	golang-any
-RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap,golang/protobuf/proto}"
+	protobuf-c-compiler libprotobuf-c-dev libfstrm-dev
+# Maintaining the go stuff in CI really seems more trouble than worth.
+#	golang-any
+#RUN bash -c "go get github.com/{FiloSottile/gvt,cloudflare/dns,dnstap/golang-dnstap,golang/protobuf/proto}"
 
 # documentation dependencies
 RUN apt-get install -y -qqq doxygen python3-sphinx python3-breathe python3-sphinx-rtd-theme