ci: drop cpp20 docker image

Signed-off-by: Vitor Bandeira <[email protected]>
vvbandeira · Nov 13, 2024 · e6efe8a · e6efe8a
1 parent aec9a7d
commit e6efe8a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -174,7 +174,7 @@ def getParallelTests(String image) {
 
         'Compile with C++20': {
             node {
-                docker.image('openroad/ubuntu-cpp20').inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock') {
+                docker.image(image).inside('--user=root --privileged -v /var/run/docker.sock:/var/run/docker.sock') {
                     stage('Setup C++20 Compile') {
                         sh label: 'Configure git', script: "git config --system --add safe.directory '*'";
                         checkout scm;

diff --git a/docker/Dockerfile.cpp20 b/docker/Dockerfile.cpp20
diff --git a/etc/DependencyInstaller.sh b/etc/DependencyInstaller.sh
@@ -666,7 +666,9 @@ _installCI() {
         apt-transport-https \
         ca-certificates \
         curl \
+        gnupg \
         jq \
+        lsb-release \
         parallel \
         software-properties-common
 
@@ -696,6 +698,12 @@ _installCI() {
         docker-ce-cli \
         containerd.io \
         docker-buildx-plugin
+
+    # Install clang for C++20 support
+    wget https://apt.llvm.org/llvm.sh
+    chmod +x llvm.sh
+    ./llvm.sh 16 all
+
 }
 
 _checkIsLocal() {