[PATCH v2 08/10] ci: stop special-casing for Ubuntu 16.04
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jan 6, 2025, 11:16 UTC
- Message-ID
- <20250106-b4-pks-ci-fixes-v2-8-06ae540771b7@pks.im>
- In-Reply-To
- <20250106-b4-pks-ci-fixes-v2-0-06ae540771b7@pks.im>
With c85bcb5de1 (gitlab-ci: switch from Ubuntu 16.04 to 20.04, 2024-10-31) we have adapted the last CI job to stop using Ubuntu 16.04 in favor of Ubuntu 20.04. Remove the special-casing we still have in our CI scripts.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- ci/lib.sh | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/ci/lib.sh b/ci/lib.sh index 2293849ada3b45873f80e4392ab93c65657d0f13..77a4aabdb8fb416c1733f02d02145b6bc0849998 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -347,14 +347,7 @@ ubuntu-*) fi MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" - case "$distro" in - ubuntu-16.04) - # Apache is too old for HTTP/2. - ;; - *) - export GIT_TEST_HTTPD=true - ;; - esac + export GIT_TEST_HTTPD=true # The Linux build installs the defined dependency versions below. # The OS X build installs much more recent versions, whichever
-- 2.48.0.rc1.245.gb3e6e7acbc.dirty