From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 21 Feb 2025 13:41:44 +0000 (+0100)
Subject: github: Remove runs on Ubuntu 20.04
X-Git-Tag: android-2.5.4~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d4decbde8e7538a84e1c425e96d84b248437ae1;p=thirdparty%2Fstrongswan.git

github: Remove runs on Ubuntu 20.04

They will start to fail on certain days in March before the images are
removed on April 1st.
---

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index e4c17a75ea..7c6b000672 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -96,27 +96,19 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-latest, ubuntu-22.04, ubuntu-20.04 ]
+        os: [ ubuntu-latest, ubuntu-22.04 ]
         test: [ botan, wolfssl, openssl, openssl-3, openssl-awslc, gcrypt ]
         leak-detective: [ no, yes ]
         exclude:
           # test custom-built libs only on the latest platform
           - os: ubuntu-22.04
             test: botan
-          - os: ubuntu-20.04
-            test: botan
           - os: ubuntu-22.04
             test: wolfssl
-          - os: ubuntu-20.04
-            test: wolfssl
           - os: ubuntu-22.04
             test: openssl-3
-          - os: ubuntu-20.04
-            test: openssl-3
           - os: ubuntu-22.04
             test: openssl-awslc
-          - os: ubuntu-20.04
-            test: openssl-awslc
     env:
       LEAK_DETECTIVE: ${{ matrix.leak-detective || 'no' }}
       CC: ${{ matrix.compiler || 'gcc' }}
@@ -160,7 +152,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ ubuntu-22.04, ubuntu-20.04 ]
+        os: [ ubuntu-22.04 ]
         test: [ all, nm ]
         compiler: [ gcc, clang ]
         exclude:
@@ -170,8 +162,6 @@ jobs:
       LEAK_DETECTIVE: ${{ matrix.leak-detective || 'no' }}
       CC: ${{ matrix.compiler || 'gcc' }}
       TEST: ${{ matrix.test }}
-      # LSan causes spurious SIGSEGV after tests due to DTLS handling by glibc (on 20.04)
-      ASAN_OPTIONS: intercept_tls_get_addr=0
     steps:
       - uses: actions/checkout@v4
       - uses: actions/cache@v4
diff --git a/scripts/test.sh b/scripts/test.sh
index ad7a66004a..f8e191fbd1 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -297,10 +297,6 @@ all|alpine|codeql|coverage|sonarcloud|no-dbg)
 			--disable-kernel-wfp --disable-kernel-iph --disable-winhttp"
 	# not enabled on the build server
 	CONFIG="$CONFIG --disable-af-alg"
-	# unable to build Botan on Ubuntu 20.04
-	if [ "$ID" = "ubuntu" -a "$VERSION_ID" = "20.04" ]; then
-		CONFIG="$CONFIG --disable-botan"
-	fi
 	if test "$TEST" != "coverage"; then
 		CONFIG="$CONFIG --disable-coverage"
 	else
@@ -330,9 +326,7 @@ all|alpine|codeql|coverage|sonarcloud|no-dbg)
 	fi
 	PYDEPS="build tox"
 	if test "$1" = "build-deps"; then
-		if [ "$ID" = "ubuntu" -a "$VERSION_ID" != "20.04" ]; then
-			build_botan
-		fi
+		build_botan
 		build_wolfssl
 		build_tss2
 	fi
@@ -457,10 +451,6 @@ fuzzing)
 	;;
 nm)
 	DEPS="gnome-common libsecret-1-dev libgtk-3-dev libnm-dev libnma-dev"
-	# Ubuntu 20.04 requires this package explicitly for the ITS rules for the .metainfo.xml file
-	if [ "$ID" = "ubuntu" -a "$VERSION_ID" = "20.04" ]; then
-		DEPS="$DEPS appstream"
-	fi
 	cd src/frontends/gnome
 	# don't run ./configure with ./autogen.sh
 	export NOCONFIGURE=1