From 868c318ba3657b4d77ce08241f568694288b6f99 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sun, 29 Jan 2023 15:17:06 +0100 Subject: [PATCH] mkosi: Add back CentOS Stream 8 to CI It's still useful to test the EFI handover logic in systemd-boot. We use a mkosi.prepare script to install a newer python and update the system to use it. --- .github/workflows/mkosi.yml | 4 +++- mkosi.prepare | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 mkosi.prepare diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml index 4b77be24b4..86321c0623 100644 --- a/.github/workflows/mkosi.yml +++ b/.github/workflows/mkosi.yml @@ -74,10 +74,12 @@ jobs: release: tumbleweed - distro: centos release: "9" + - distro: centos + release: "8" steps: - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b - - uses: systemd/mkosi@37c0524360ee460174f83081fa14e0dc9bc6ee0d + - uses: systemd/mkosi@f36983f552a197faf9e36361cc68a297e68bee73 - name: Configure run: | diff --git a/mkosi.prepare b/mkosi.prepare new file mode 100755 index 0000000000..9d377cf716 --- /dev/null +++ b/mkosi.prepare @@ -0,0 +1,19 @@ +#!/bin/sh +# SPDX-License-Identifier: LGPL-2.1-or-later +set -e + +if [ "$(grep '^ID=' /etc/os-release)" = "ID=\"centos\"" ] && [ "$(grep '^VERSION=' /etc/os-release)" = "VERSION=\"8\"" ]; then + # python39-pluggy is a pytest dependency that's not installed for some reason. + dnf \ + -y \ + --enablerepo=powertools \ + --setopt=powertools.module_hotfixes=true \ + install \ + python39 \ + python39-pefile \ + python39-jinja2 \ + python39-pytest \ + python39-pluggy + alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 1 + alternatives --set python3 /usr/bin/python3.9 +fi -- 2.25.1