github: Remove build on Ubuntu Xenial (16.04)

Support for it will be removed later this month.

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index b1834a842a2af667ba9002cb0b991d990f45607f..9ac3ef0985a2145285eab06f94cf567c19e84452 100644 (file)
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -153,43 +153,3 @@ jobs:
           name: Logs ${{ github.job }}
           path: config.log
           retention-days: 5
-
-  xenial:
-    needs: pre-check
-    if: ${{ needs.pre-check.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-16.04
-    strategy:
-      matrix:
-        test: [ all ]
-        compiler: [ gcc, clang ]
-        include:
-          - test: openssl-1.0
-          - test: openssl-1.0
-            leak-detective: yes
-    env:
-      LEAK_DETECTIVE: ${{ matrix.leak-detective || 'no' }}
-      CC: ${{ matrix.compiler || 'gcc' }}
-      TEST: ${{ matrix.test }}
-      # this is the default with newer versions and fixes builds with clang
-      CCACHE_CPP2: true
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/cache@v2
-        with:
-          path: ~/.ccache
-          key: ccache-xenial-${{ env.CC }}-${{ matrix.test }}-${{ github.sha }}
-          restore-keys: |
-            ccache-xenial-${{ env.CC }}-${{ matrix.test }}-
-            ccache-xenial-${{ env.CC }}-
-      - run: |
-          sudo apt-get install -qq ccache
-          echo "PATH=/usr/lib/ccache:$PATH" >> $GITHUB_ENV
-          ccache -z
-      - uses: ./.github/actions/default
-      - run: ccache -s
-      - if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
-        with:
-          name: Logs ${{ github.job }}
-          path: config.log
-          retention-days: 5

diff --git a/scripts/test.sh b/scripts/test.sh
index 1c0efd6d7c1ced4700401dca6abd98732a8ac0f3..ddd9db4198397908fefe513e5efb4651bb59b0e2 100755 (executable)
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -168,10 +168,6 @@ all|coverage|sonarcloud)
                # not actually required but configure checks for it
                DEPS="$DEPS lcov"
        fi
-       # Botan requires newer compilers, so disable it on Ubuntu 16.04
-       if [ "$ID" = "ubuntu" -a "$VERSION_ID" = "16.04" ]; then
-               CONFIG="$CONFIG --disable-botan"
-       fi
        DEPS="$DEPS libcurl4-gnutls-dev libsoup2.4-dev libunbound-dev libldns-dev
                  libmysqlclient-dev libsqlite3-dev clearsilver-dev libfcgi-dev
                  libldap2-dev libpcsclite-dev libpam0g-dev binutils-dev libnm-dev
@@ -181,14 +177,9 @@ all|coverage|sonarcloud)
        else
                DEPS="$DEPS iptables-dev python3-setuptools"
        fi
-       # tox has dependencies that can't be resolved on 16.04 (even with pip)
-       if [ "$ID" != "ubuntu" -o "$VERSION_ID" != "16.04" ]; then
-               PYDEPS="tox"
-       fi
+       PYDEPS="tox"
        if test "$1" = "build-deps"; then
-               if [ "$ID" != "ubuntu" -o "$VERSION_ID" != "16.04" ]; then
-                       build_botan
-               fi
+               build_botan
                build_wolfssl
                build_tss2
        fi