Merge pull request #2221 from krop/calamares

Improve the openSUSE CI files
This commit is contained in:
Adriaan de Groot 2023-10-23 21:54:37 +02:00 committed by GitHub
commit 594bc5b169
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions

View File

@ -4,7 +4,7 @@
# #
# Add a Qt6/KF6 repo # Add a Qt6/KF6 repo
zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:krop:kf6/openSUSE_Tumbleweed/home:krop:kf6.repo zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:krop:kf6/openSUSE_Tumbleweed/home:krop:kf6.repo
zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/home:/krop:/Qt6:/Release/openSUSE_Tumbleweed/home:krop:Qt6:Release.repo zypper --non-interactive addrepo -G https://download.opensuse.org/repositories/KDE:/Qt6/openSUSE_Tumbleweed/KDE:Qt6.repo
zypper --non-interactive refresh zypper --non-interactive refresh
zypper --non-interactive up zypper --non-interactive up
@ -14,7 +14,7 @@ zypper --non-interactive in bison flex git make cmake gcc-c++
zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python3-devel zypper --non-interactive in yaml-cpp-devel libpwquality-devel parted-devel python3-devel
zypper --non-interactive in libicu-devel libatasmart-devel zypper --non-interactive in libicu-devel libatasmart-devel
# Qt6/KF6 dependencies # Qt6/KF6 dependencies
zypper --non-interactive in qt6-concurrent-devel qt6-gui-devel qt6-linguist-devel qt6-network-devel qt6-svg-devel qt6-declarative-devel zypper --non-interactive in "qt6-declarative-devel" "cmake(Qt6Concurrent)" "cmake(Qt6Gui)" "cmake(Qt6Network)" "cmake(Qt6Svg)" "cmake(Qt6Linguist)"
zypper --non-interactive in kf6-kcoreaddons-devel kf6-kdbusaddons-devel kf6-kcrash-devel zypper --non-interactive in "cmake(KF6CoreAddons)" "cmake(KF6DBusAddons)" "cmake(KF6Crash)"
zypper --non-interactive in kf6-kparts-devel # Also installs KF5 things zypper --non-interactive in "cmake(KF6Parts)" # Also installs KF5 things
zypper --non-interactive in libpolkit-qt6-1-devel zypper --non-interactive in "cmake(PolkitQt6-1)"

View File

@ -14,12 +14,12 @@ zypper --non-interactive in \
"gcc-c++" "gcc-c++"
zypper --non-interactive in \ zypper --non-interactive in \
"libqt5-qtbase-devel" \ "libqt5-qtbase-devel" \
"libqt5-linguist-devel" \
"libqt5-qtsvg-devel" \
"libqt5-qtdeclarative-devel" \ "libqt5-qtdeclarative-devel" \
"libqt5-qtwebengine-devel" \ "cmake(Qt5LinguistTools)" \
"cmake(Qt5Svg)" \
"cmake(Qt5WebEngine)" \
"cmake(PolkitQt5-1)" \
"yaml-cpp-devel" \ "yaml-cpp-devel" \
"libpolkit-qt5-1-devel" \
"libpwquality-devel" \ "libpwquality-devel" \
"parted-devel" \ "parted-devel" \
"python-devel" \ "python-devel" \
@ -27,14 +27,14 @@ zypper --non-interactive in \
"libboost_python3-devel" "libboost_python3-devel"
zypper --non-interactive in \ zypper --non-interactive in \
"extra-cmake-modules" \ "extra-cmake-modules" \
"kdbusaddons-devel" \ "cmake(KF5Crash)" \
"kservice-devel" \ "cmake(KF5DBusAddons)" \
"kpackage-devel" \ "cmake(KF5Package)" \
"kparts-devel" \ "cmake(KF5Parts)" \
"kcrash-devel" \ "cmake(KF5Plasma)" \
"kpmcore-devel" \ "cmake(KF5Service)" \
"plasma5-workspace-devel" \ "cmake(KPMcore)" \
"plasma-framework-devel" "cmake(LibKWorkspace)"
# Additional dependencies # Additional dependencies
zypper --non-interactive in \ zypper --non-interactive in \
libicu-devel \ libicu-devel \