From 97da73b1703296089467b6d6e6290f113f05f842 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 31 Oct 2023 16:29:54 +0100 Subject: [PATCH] CI: don't fail the deps-installation scripts Let CMake detect missing dependencies, one stage later in CI --- ci/deps-debian11.sh | 1 + ci/deps-fedora-qt6.sh | 4 +++- ci/deps-kaos.sh | 2 +- ci/deps-neon.sh | 1 + ci/deps-opensuse-qt6.sh | 1 + ci/deps-opensuse.sh | 1 + 6 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ci/deps-debian11.sh b/ci/deps-debian11.sh index 312364516..f8718f756 100755 --- a/ci/deps-debian11.sh +++ b/ci/deps-debian11.sh @@ -43,3 +43,4 @@ apt-get -y install \ libpwquality-dev \ libqt5webenginewidgets5 \ qtwebengine5-dev +true diff --git a/ci/deps-fedora-qt6.sh b/ci/deps-fedora-qt6.sh index aea4ba686..9e429e6a3 100755 --- a/ci/deps-fedora-qt6.sh +++ b/ci/deps-fedora-qt6.sh @@ -15,4 +15,6 @@ yum install -y qt6-qtbase-devel qt6-linguist qt6-qtbase-private-devel qt6-qtdecl yum install -y kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel yum install -y polkit-qt6-1-devel appstream-qt-devel # Runtime dependencies for QML modules -yum install -y kf6-kirigami2-devel qt6-qt5compat-devel +yum install -y kf6-kirigami2-devel || true +yum install -y qt6-qt5compat-devel || true +true diff --git a/ci/deps-kaos.sh b/ci/deps-kaos.sh index 29310173c..76b3665dc 100755 --- a/ci/deps-kaos.sh +++ b/ci/deps-kaos.sh @@ -22,4 +22,4 @@ pacman -S --noconfirm \ "kio" \ "kparts" \ "qtwebengine" - +true diff --git a/ci/deps-neon.sh b/ci/deps-neon.sh index 5ae1561c5..8e3802337 100755 --- a/ci/deps-neon.sh +++ b/ci/deps-neon.sh @@ -33,3 +33,4 @@ apt-get -y install \ qtdeclarative5-dev \ qttools5-dev \ qttools5-dev-tools +true diff --git a/ci/deps-opensuse-qt6.sh b/ci/deps-opensuse-qt6.sh index 8b32a02dc..f4f709508 100755 --- a/ci/deps-opensuse-qt6.sh +++ b/ci/deps-opensuse-qt6.sh @@ -18,3 +18,4 @@ zypper --non-interactive in "qt6-declarative-devel" "cmake(Qt6Concurrent)" "cmak zypper --non-interactive in "cmake(KF6CoreAddons)" "cmake(KF6DBusAddons)" "cmake(KF6Crash)" zypper --non-interactive in "cmake(KF6Parts)" # Also installs KF5 things zypper --non-interactive in "cmake(PolkitQt6-1)" +true diff --git a/ci/deps-opensuse.sh b/ci/deps-opensuse.sh index f05aede9a..d0c9f6b67 100755 --- a/ci/deps-opensuse.sh +++ b/ci/deps-opensuse.sh @@ -43,3 +43,4 @@ zypper --non-interactive in \ # Not actual dependencies, but good to have zypper --non-interactive in python311-PyYAML python311-jsonschema +true