From 049868a39247b688c9c53d636e775009dba38490 Mon Sep 17 00:00:00 2001
From: Tobias Pfandzelter <pfandzelter@campus.tu-berlin.de>
Date: Mon, 2 Aug 2021 10:30:49 +0200
Subject: [PATCH 1/2] update ci image

---
 .gitlab-ci.yml |  1 -
 ci/Dockerfile  | 16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2103991..329edf5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@ stages:
   - release
 
 before_script:
-  - export CC=clang
   - make dep
 
 golint:
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 3746742..857b00d 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -6,25 +6,15 @@ ENV GOPATH /go
 ENV PATH ${GOPATH}/bin:$PATH
 RUN curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.41.1
 
-# Add apt key for LLVM repository
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-
-# Add LLVM apt repository
-RUN echo "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-5.0 main" | tee -a /etc/apt/sources.list
-
 # Install clang from LLVM repository
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    clang \
+    gcc \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Set Clang as default CC
-ENV set_clang /etc/profile.d/set-clang-cc.sh
-RUN echo "export CC=clang-7.0" | tee -a ${set_clang} && chmod a+x ${set_clang}
-
 # Install Docker (to build images)
 ENV DOCKER_CHANNEL stable
-ENV DOCKER_VERSION 19.03.5
+ENV DOCKER_VERSION 20.10.7
 
 RUN set -eux; \
     \
@@ -52,5 +42,5 @@ RUN set -eux; \
     docker --version
 
 # Install Docker Compose
-RUN curl -L "https://github.com/docker/compose/releases/download/1.26.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
+RUN curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
 RUN chmod +x /usr/local/bin/docker-compose
-- 
GitLab


From 2744332342a42157a69da17122ec563a50743dde Mon Sep 17 00:00:00 2001
From: Tobias Pfandzelter <pfandzelter@campus.tu-berlin.de>
Date: Mon, 2 Aug 2021 10:46:42 +0200
Subject: [PATCH 2/2] remove msan

---
 .gitlab-ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 329edf5..e36dda6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,11 +24,6 @@ race_detector:
   script:
     - make race
 
-memory_sanitizer:
-  stage: test
-  script:
-    - make msan
-
 code_coverage:
   stage: test
   script:
-- 
GitLab