From 613ee04f9b9c60f2d958a5ee1e92a056e464af0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1t=C3=A9=20Cser=C3=A9p?= <mcserep@gmail.com>
Date: Tue, 30 Apr 2024 08:30:35 +0200
Subject: [PATCH] Update Tarball generation for Ubuntu 20.04 Focal Fossa.

NodeJS v18 is not compatible with Ubuntu 16.04, due to the GLIBC mismatch.
---
 .gitlab/build-deps.sh |  8 ++---
 .gitlab/ci.yml        | 79 +++++--------------------------------------
 2 files changed, 12 insertions(+), 75 deletions(-)

diff --git a/.gitlab/build-deps.sh b/.gitlab/build-deps.sh
index 1701860d4..09db12e0d 100644
--- a/.gitlab/build-deps.sh
+++ b/.gitlab/build-deps.sh
@@ -373,12 +373,12 @@ rm -f $PACKAGES_DIR/release-1.10.0.tar.gz
 #######
 
 cd $PACKAGES_DIR
-wget --no-verbose --no-clobber https://nodejs.org/dist/v16.20.2/node-v16.20.2-linux-x64.tar.xz
-tar -xf node-v16.20.2-linux-x64.tar.xz -C $DEPS_INSTALL_RUNTIME_DIR
-rm -f node-v16.20.2-linux-x64.tar.xz
+wget --no-verbose --no-clobber https://nodejs.org/dist/v18.20.2/node-v18.20.2-linux-x64.tar.xz
+tar -xf node-v18.20.2-linux-x64.tar.xz -C $DEPS_INSTALL_RUNTIME_DIR
+rm -f node-v18.20.2-linux-x64.tar.xz
 
 cd $DEPS_INSTALL_RUNTIME_DIR
-mv node-v16.20.2-linux-x64 node-install
+mv node-v18.20.2-linux-x64 node-install
 export PATH=$DEPS_INSTALL_RUNTIME_DIR/node-install/bin:$PATH
 
 ############
diff --git a/.gitlab/ci.yml b/.gitlab/ci.yml
index acb3e8f45..625890def 100644
--- a/.gitlab/ci.yml
+++ b/.gitlab/ci.yml
@@ -61,65 +61,16 @@ variables:
     echo "GLIBC version: $GLIBC_VERSION"
     echo "GLIBCXX versions: $GLIBCXX_VERSIONS"
 
-tarball suse-15:
+tarball ubuntu-20.04:
     extends: .tarball
-    image: opensuse/leap:15
+    image: ubuntu:20.04
     cache:
-        key: "leap"
+        key: "focal"
     variables:
         GCC_VERSION: 9.3.0
         ODB_VERSION: 2.5.0
-    before_script:
-        - zypper refresh
-        - zypper update -y
-        # download tools
-        - zypper install -y curl wget gzip bzip2 unzip ca-certificates
-        # build tools for CodeCompass
-        - zypper install -y -t pattern devel_basis
-        - zypper install -y binutils gcc-c++ gmp-devel
-        # build tools for OpenLDAP
-        - zypper install -y groff
-        # build tools for ccdb-tools
-        - zypper install -y libffi-devel
-        # show GLIBC verison
-        - *show-glibc-version
-
-# Permanently disabled job
-# (Distribution package repository metadata not available anymore.)
-.tarball suse-42.1:
-    extends: .tarball
-    image: opensuse/archive:42.1
-    cache:
-        key: "malachite"
-    variables:
-        GCC_VERSION: 5.5.0
-        ODB_VERSION: 2.4.0
-    before_script:
-        - zypper refresh
-        - zypper update -y
-        # download tools
-        - zypper install -y curl wget gzip bzip2 unzip ca-certificates
-        # build tools for CodeCompass
-        - zypper install -y -t pattern devel_basis
-        - zypper install -y binutils gcc-c++ gmp-devel
-        # build tools for OpenLDAP
-        - zypper install -y groff
-        # build tools for ccdb-tools
-        - zypper install -y libffi-devel
-        # disable SSL certificate check (distribution's cacert is outdated)
-        - echo "check_certificate = off" >> /etc/wgetrc
-        - echo insecure >> ~/.curlrc
-        # show GLIBC verison
-        - *show-glibc-version
-
-tarball ubuntu-16.04:
-    extends: .tarball
-    image: ubuntu:16.04
-    cache:
-        key: "xenial"
-    variables:
-        GCC_VERSION: 5.5.0
-        ODB_VERSION: 2.4.0
+        # No interactive timezone dialog for tzdata
+        DEBIAN_FRONTEND: noninteractive
     before_script:
         - apt-get update -yqq
         # download tools
@@ -154,22 +105,8 @@ tarball ubuntu-16.04:
         - scp -P22 build/codecompass.tar.gz gitlab-deployer@codecompass.net:/var/www/codecompass/$FILENAME
         - ssh -p22 gitlab-deployer@codecompass.net "mv -f /var/www/codecompass/$FILENAME /var/www/codecompass/live/wwwroot/tarball/$FILENAME"
 
-upload suse-15:
-    extends: .upload
-    variables:
-        ARCH_SUFFIX: suse-15
-    needs: ["tarball suse-15"]
-
-# Permanently disabled job
-# (Distribution package repository metadata not available anymore.)
-.upload suse-42.1:
-    extends: .upload
-    variables:
-        ARCH_SUFFIX: suse-42.1
-    needs: ["tarball suse-42.1"]
-
-upload ubuntu-16.04:
+upload ubuntu-20.04:
     extends: .upload
     variables:
-        ARCH_SUFFIX: ubuntu-16.04
-    needs: ["tarball ubuntu-16.04"]
+        ARCH_SUFFIX: ubuntu-20.04
+    needs: ["tarball ubuntu-20.04"]