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.
This commit is contained in:
Tobias Brunner
2025-02-21 14:46:08 +01:00
parent 5468759c71
commit 9d4decbde8
2 changed files with 3 additions and 23 deletions
+2 -12
View File
@@ -96,27 +96,19 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: 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 ] test: [ botan, wolfssl, openssl, openssl-3, openssl-awslc, gcrypt ]
leak-detective: [ no, yes ] leak-detective: [ no, yes ]
exclude: exclude:
# test custom-built libs only on the latest platform # test custom-built libs only on the latest platform
- os: ubuntu-22.04 - os: ubuntu-22.04
test: botan test: botan
- os: ubuntu-20.04
test: botan
- os: ubuntu-22.04 - os: ubuntu-22.04
test: wolfssl test: wolfssl
- os: ubuntu-20.04
test: wolfssl
- os: ubuntu-22.04 - os: ubuntu-22.04
test: openssl-3 test: openssl-3
- os: ubuntu-20.04
test: openssl-3
- os: ubuntu-22.04 - os: ubuntu-22.04
test: openssl-awslc test: openssl-awslc
- os: ubuntu-20.04
test: openssl-awslc
env: env:
LEAK_DETECTIVE: ${{ matrix.leak-detective || 'no' }} LEAK_DETECTIVE: ${{ matrix.leak-detective || 'no' }}
CC: ${{ matrix.compiler || 'gcc' }} CC: ${{ matrix.compiler || 'gcc' }}
@@ -160,7 +152,7 @@ jobs:
runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
strategy: strategy:
matrix: matrix:
os: [ ubuntu-22.04, ubuntu-20.04 ] os: [ ubuntu-22.04 ]
test: [ all, nm ] test: [ all, nm ]
compiler: [ gcc, clang ] compiler: [ gcc, clang ]
exclude: exclude:
@@ -170,8 +162,6 @@ jobs:
LEAK_DETECTIVE: ${{ matrix.leak-detective || 'no' }} LEAK_DETECTIVE: ${{ matrix.leak-detective || 'no' }}
CC: ${{ matrix.compiler || 'gcc' }} CC: ${{ matrix.compiler || 'gcc' }}
TEST: ${{ matrix.test }} 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: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: actions/cache@v4 - uses: actions/cache@v4
+1 -11
View File
@@ -297,10 +297,6 @@ all|alpine|codeql|coverage|sonarcloud|no-dbg)
--disable-kernel-wfp --disable-kernel-iph --disable-winhttp" --disable-kernel-wfp --disable-kernel-iph --disable-winhttp"
# not enabled on the build server # not enabled on the build server
CONFIG="$CONFIG --disable-af-alg" 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 if test "$TEST" != "coverage"; then
CONFIG="$CONFIG --disable-coverage" CONFIG="$CONFIG --disable-coverage"
else else
@@ -330,9 +326,7 @@ all|alpine|codeql|coverage|sonarcloud|no-dbg)
fi fi
PYDEPS="build tox" PYDEPS="build tox"
if test "$1" = "build-deps"; then if test "$1" = "build-deps"; then
if [ "$ID" = "ubuntu" -a "$VERSION_ID" != "20.04" ]; then build_botan
build_botan
fi
build_wolfssl build_wolfssl
build_tss2 build_tss2
fi fi
@@ -457,10 +451,6 @@ fuzzing)
;; ;;
nm) nm)
DEPS="gnome-common libsecret-1-dev libgtk-3-dev libnm-dev libnma-dev" 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 cd src/frontends/gnome
# don't run ./configure with ./autogen.sh # don't run ./configure with ./autogen.sh
export NOCONFIGURE=1 export NOCONFIGURE=1