[PATCH 1/2] ci: fix check for Ubuntu 20.04
- From
Patrick Steinhardt <ps@pks.im>
- Date
- Jun 6, 2024, 06:30 UTC
- Message-ID
- <f91004a4382c95b1b87bf3d1aafc018af2b7b92e.1717655210.git.ps@pks.im>
- In-Reply-To
- <cover.1717655210.git.ps@pks.im>
In 5ca0c455f1 (ci: fix Python dependency on Ubuntu 24.04, 2024-05-06), we made the use of Python 2 conditional on whether or not the CI job runs Ubuntu 20.04. There was a brown-paper-bag-style bug though, where the condition forgot to invoke the `test` builtin. The result of it is that the check always fails, and thus all of our jobs run with Python 3 by accident.
Fix this.
Signed-off-by: Patrick Steinhardt <ps@pks.im> --- ci/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci/lib.sh b/ci/lib.sh index 1f4059b1b8..814578ffc6 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -328,7 +328,7 @@ ubuntu-*) # Python 2 is end of life, and Ubuntu 23.04 and newer don't actually # have it anymore. We thus only test with Python 2 on older LTS # releases. - if "$distro" = "ubuntu-20.04" + if test "$distro" = "ubuntu-20.04" then PYTHON_PACKAGE=python2 else
-- 2.45.2.409.g7b0defb391.dirty