From 2bd4c19a7dc5da1fb8de9ef4b1e1960e9af36cf9 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 8 Nov 2023 06:42:16 -0500 Subject: [PATCH] CI: Switch Fedora Qt 6 builds to Fedora Linux 40 Fedora Linux 40 has the necessary components as part of upgrading to KDE Plasma 6. --- .github/workflows/nightly-fedora-qt6.yml | 2 +- ci/deps-fedora-qt6.sh | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/nightly-fedora-qt6.yml b/.github/workflows/nightly-fedora-qt6.yml index 5fd9fb792..8c14ce807 100644 --- a/.github/workflows/nightly-fedora-qt6.yml +++ b/.github/workflows/nightly-fedora-qt6.yml @@ -17,7 +17,7 @@ jobs: build: runs-on: ubuntu-latest container: - image: docker://fedora:39 + image: docker://registry.fedoraproject.org/fedora:40 options: --tmpfs /build:rw --user 0:0 steps: - name: "prepare git" diff --git a/ci/deps-fedora-qt6.sh b/ci/deps-fedora-qt6.sh index 9e429e6a3..4bb7bb095 100755 --- a/ci/deps-fedora-qt6.sh +++ b/ci/deps-fedora-qt6.sh @@ -3,10 +3,6 @@ # Install dependencies for the nightly-fedora-qt6 build # -# Add the KF6 repo -dnf install -y 'dnf-command(copr)' -dnf copr enable -y @kdesig/kde-nightly-qt6 - yum install -y bison flex git make cmake gcc-c++ ninja-build yum install -y yaml-cpp-devel libpwquality-devel parted-devel python-devel gettext gettext-devel yum install -y libicu-devel libatasmart-devel