diff --git a/archive-configs/production.yaml b/archive-configs/production.yaml index a3e326d..8d6f865 100644 --- a/archive-configs/production.yaml +++ b/archive-configs/production.yaml @@ -1,17 +1,18 @@ client: downloadBaseUrl: "https://build-artifacts.kde.org/production/" uploadHostname: "build-artifacts.kde.org" uploadUsername: "productionclient" uploadDirectory: "/home/productionclient/uploads/" uploadTools: "/home/productionclient/ci-tooling/" server: archiveDirectory: "/srv/production/" cacheLocation: WindowsMSVCQt5.14: "C:\\CI\\archives\\WindowsMSVCQt5.14\\" SUSEQt5.12: "/srv/archives/production/SUSEQt5.12/" SUSEQt5.13: "/srv/archives/production/SUSEQt5.13/" + SUSEQt5.14: "/srv/archives/production/SUSEQt5.14/" FreeBSDQt5.14: "/usr/home/jenkins/archives/production/" AndroidQt5.14: "/srv/archives/production/AndroidQt5.14/" ABIReference: "/srv/archives/production/ABIReference" diff --git a/archive-configs/sandbox.yaml b/archive-configs/sandbox.yaml index 77447d7..40f0cc2 100644 --- a/archive-configs/sandbox.yaml +++ b/archive-configs/sandbox.yaml @@ -1,17 +1,18 @@ client: downloadBaseUrl: "https://build-artifacts.kde.org/sandbox/" uploadHostname: "build-artifacts.kde.org" uploadUsername: "sandboxclient" uploadDirectory: "/home/sandboxclient/uploads/" uploadTools: "/home/sandboxclient/ci-tooling/" server: archiveDirectory: "/srv/sandbox/" cacheLocation: WindowsMSVCQt5.14: "C:\\CI\\sandbox-archives\\WindowsMSVCQt5.14\\" SUSEQt5.12: "/srv/archives/sandbox/SUSEQt5.12/" SUSEQt5.13: "/srv/archives/sandbox/SUSEQt5.13/" + SUSEQt5.14: "/srv/archives/sandbox/SUSEQt5.14/" FreeBSDQt5.14: "/usr/home/jenkins/archives/sandbox/" AndroidQt5.14: "/srv/archives/sandbox/AndroidQt5.14/" ABIReference: "/srv/archives/sandbox/ABIReference/" diff --git a/helpers/check-platform.py b/helpers/check-platform.py index d1e9090..dc0e935 100644 --- a/helpers/check-platform.py +++ b/helpers/check-platform.py @@ -1,41 +1,42 @@ #!/usr/bin/python3 import os import sys import argparse import subprocess import yaml from helperslib import BuildSpecs, Buildable, CommonUtils, EnvironmentHandler parser = argparse.ArgumentParser(description='Utility to check if metainfo.yaml is lying.', formatter_class=argparse.ArgumentDefaultsHelpFormatter) parser.add_argument('metainfo', nargs='+', help='metainfo.yaml files', type=str) arguments = parser.parse_args() allPlatforms = { 'SUSEQt5.12': 'Linux', 'SUSEQt5.13': 'Linux', + 'SUSEQt5.14': 'Linux', 'FreeBSDQt5.14': 'FreeBSD', 'WindowsMSVCQt5.14': 'Windows', None: 'MacOSX', 'AndroidQt5.14': 'Android' } resolver = Buildable.DependencyResolver() resolver.loadProjectsFromTree(os.path.join( CommonUtils.scriptsBaseDirectory(), 'repo-metadata', 'projects' )) resolver.loadProjectsIgnoreRules(os.path.join( CommonUtils.scriptsBaseDirectory(), 'local-metadata', 'project-ignore-rules.yaml' )) for metainfo in arguments.metainfo: metainfoFile = open(metainfo, 'r', encoding='utf-8') read = yaml.safe_load(metainfoFile) platforms = [p['name'] for p in read['platforms']] if 'All' in platforms: platforms = allPlatforms.values() projectname=os.path.split(metainfo)[-2] p = resolver.retrieveProject( projectname ) if not p: # could not find the project for some reason continue ignoredPlatforms = [allPlatforms[ignoredPlatform] for ignoredPlatform in p.ignoredOnPlatforms] for ip in ignoredPlatforms: if ip in platforms: print('%s: %s is disabled in build.kde.org' % (projectname, ip)) diff --git a/local-metadata/product-definitions.yaml b/local-metadata/product-definitions.yaml index 83c1f5a..9e903e7 100644 --- a/local-metadata/product-definitions.yaml +++ b/local-metadata/product-definitions.yaml @@ -1,311 +1,311 @@ "Frameworks": includes: - repositories: - "frameworks/*" platforms: - "SUSEQt5.12" - - "SUSEQt5.13" + - "SUSEQt5.14" - "WindowsMSVCQt5.14" - "FreeBSDQt5.14" - repositories: - "frameworks/extra-cmake-modules" - "frameworks/karchive" - "frameworks/attica" - "frameworks/breeze-icons" - "frameworks/kcodecs" - "frameworks/kconfig" - "frameworks/kcoreaddons" - "frameworks/kguiaddons" - "frameworks/kconfig" - "frameworks/ki18n" - "frameworks/kirigami" - "frameworks/kwidgetsaddons" - "frameworks/threadweaver" - "frameworks/kpackage" - "frameworks/kunitconversion" - "frameworks/kimageformats" - "frameworks/kjobwidgets" - "frameworks/kcompletion" - "frameworks/kwindowsystem" - "frameworks/prison" - "frameworks/knotifications" - "frameworks/kholidays" - "frameworks/kitemmodels" - "frameworks/kitemviews" - "frameworks/kplotting" - "frameworks/syndication" - "frameworks/kpeople" platforms: - "AndroidQt5.14" branchGroups: - "kf5-qt5" notifications: - match: "frameworks/*" to: "kde-frameworks-devel@kde.org" failuresOnly: false "Plasma": includes: - repositories: - "kde/workspace/*" - "frameworks/kwindowsystem" - "frameworks/kwayland" - "frameworks/plasma-framework" platforms: - - "SUSEQt5.12" + - "SUSEQt5.14" - "FreeBSDQt5.14" - repositories: - "kde/workspace/drkonqi" platforms: - "WindowsMSVCQt5.14" branchGroups: - "kf5-qt5" - "stable-kf5-qt5" notifications: - match: "frameworks/*" to: "plasma-devel@kde.org" failuresOnly: true - match: "kde/workspace/*" to: "plasma-devel@kde.org" failuresOnly: true "Applications": includes: - repositories: - "kde/applications/*" - "kde/kdeaccessibility/*" - "kde/kdeadmin/*" - "kde/kdeedu/*" - "kde/kdegames/*" - "kde/kdegraphics/*" - "kde/kdemultimedia/*" - "kde/kdenetwork/*" - "kde/kdesdk/*" - "kde/kdeutils/*" - "kde/kdewebdev/*" - "kde/pim/*" platforms: - "SUSEQt5.12" - "FreeBSDQt5.14" - repositories: - "kde/applications/baloo-widgets" - "kde/applications/dolphin" - "kde/applications/kate" - "kde/kdeedu/kalgebra" - "kde/kdeedu/kbruch" - "kde/kdeedu/kig" - "kde/kdeedu/kmplot" - "kde/kdeedu/kturtle" - "kde/kdeedu/kwordquiz" - "kde/kdeedu/minuet" - "kde/kdeedu/parley" - "kde/kdegraphics/libs/libkexiv2" - "kde/kdegraphics/kdegraphics-mobipocket" - "kde/kdegraphics/kolourpaint" - "kde/kdegraphics/okular" - "kde/kdemultimedia/elisa" - "kde/kdenetwork/kdeconnect-kde" - "kde/kdenetwork/kio-extras" - "kde/kdesdk/umbrello" - "kde/kdeutils/filelight" - "kde/pim/akonadi" - "kde/pim/kcalcore" - "kde/pim/kcalutils" - 'kde/pim/kidentitymanagement' - 'kde/pim/kcontacts' - "kde/pim/kpimtextedit" platforms: - "WindowsMSVCQt5.14" - repositories: - "kde/kdemultimedia/elisa" platforms: - "AndroidQt5.14" branchGroups: - "kf5-qt5" - "stable-kf5-qt5" notifications: - match: "kde/pim/*" to: "kde-pim@kde.org" failuresOnly: true - match: "kde/applications/dolphin" to: "kfm-devel@kde.org" failuresOnly: false - match: "kde/applications/kate" to: "christoph@cullmann.io" failuresOnly: true - match: "kde/applications/konsole" to: "konsole-devel@kde.org" failuresOnly: true - match: "kde/kdeutils/*" to: "kde-utils-devel@kde.org" failuresOnly: false - match: "kde/kdegraphics/okular" to: "okular-devel@kde.org" failuresOnly: false - match: "kde/kdeedu/cantor" to: "alexander.semke@web.de" failuresOnly: false - match: "kde/kdeedu/cantor" to: "warquark@gmail.com" failuresOnly: false - match: "kde/kdemultimedia/kdenlive" to: "kdenlive@kde.org" failuresOnly: true - match: "kde/kdemultimedia/elisa" to: "elisa@kde.org" failuresOnly: false - match: "kde/kdenetwork/kdeconnect-kde" to: "kdeconnect@kde.org" failuresOnly: false "Extragear": includes: - repositories: - "extragear/network/choqok" - "extragear/network/kio-gdrive" - "extragear/office/kbibtex" - "extragear/pim/zanshin" - "extragear/sdk/clazy" - "extragear/utils/kronometer" - "kdereview/rust-qt-binding-generator" platforms: - "SUSEQt5.12" - repositories: - "extragear/base/kwebkitpart" - "extragear/base/latte-dock" - "extragear/base/wacomtablet" - "extragear/edu/gcompris" - "extragear/games/knights" - "extragear/graphics/kgraphviewer" - "extragear/graphics/kphotoalbum" - "extragear/graphics/krita" - "extragear/libs/kuserfeedback" - "extragear/libs/kpublictransport" - "extragear/libs/libqaccessibilityclient" - "extragear/libs/pulseaudio-qt" - "extragear/multimedia/amarok" - "extragear/multimedia/kaffeine" - "extragear/network/falkon" - "extragear/network/libktorrent" - "extragear/network/ktorrent" - "extragear/office/tellico" - "extragear/pim/itinerary" - "extragear/pim/ring-kde" - "extragear/sdk/kdesvn" - "extragear/utils/keurocalc" - "extragear/utils/keysmith" - "extragear/utils/krusader" - "extragear/utils/kio-stash" - "extragear/utils/kmarkdownwebview" - "extragear/utils/plasma-mycroft" - "extragear/utils/rsibreak" - "kdereview/plasma-active-window-control" - "playground/multimedia/subtitlecomposer" platforms: - "SUSEQt5.12" - "FreeBSDQt5.14" - repositories: - "extragear/base/atcore" - "extragear/network/konversation" - "extragear/edu/labplot" - "extragear/edu/kstars" - "extragear/graphics/digikam" - "extragear/office/alkimia" - "extragear/office/kile" - "extragear/office/kmymoney" - "extragear/office/skrooge" - "extragear/pim/ktimetracker" - "extragear/utils/krename" - "extragear/utils/okteta" - "extragear/utils/kdiff3" - "kdereview/rkward" - "kdereview/ruqola" - "playground/base/peruse" - "playground/graphics/washipad" - "playground/utils/kongress" platforms: - "SUSEQt5.12" - "WindowsMSVCQt5.14" - "FreeBSDQt5.14" - repositories: - "playground/base/kirogi" platforms: - "SUSEQt5.13" - "FreeBSDQt5.14" - "AndroidQt5.14" branchGroups: - "kf5-qt5" - "stable-kf5-qt5" notifications: - match: "extragear/utils/kronometer" to: "kde-utils-devel@kde.org" failuresOnly: false - match: "extragear/graphics/digikam" to: "digikam-devel@kde.org" failuresOnly: false - match: "extragear/network/kio-gdrive" to: "kfm-devel@kde.org" failuresOnly: false - match: "extragear/sdk/clazy" to: "smartins@kde.org" failuresOnly: false - match: "extragear/pim/zanshin" to: "zanshin-devel@kde.org" failuresOnly: false - match: "extragear/edu/labplot" to: "stefan.gerlach@uni-konstanz.de" failuresOnly: false - match: "extragear/edu/labplot" to: "alexander.semke@web.de" failuresOnly: false - match: "extragear/edu/kstars" to: "mutlaqja@ikarustech.com" failuresOnly: false - match: "extragear/utils/kdiff3" to: "reeves87@gmail.com" failuresOnly: true - match: "extragear/pim/ktimetracker" to: "aspotashev@gmail.com" failuresOnly: true - match: "extragear/libs/kpublictransport" to: "vkrause@kde.org" failuresOnly: false - match: "extragear/pim/itinerary" to: "vkrause@kde.org" failuresOnly: false "KDevelop": includes: - repositories: - "extragear/kdevelop/*" - "playground/devtools/kdev-*" - "playground/devtools/plugins/kdev-*" platforms: - "SUSEQt5.12" - "FreeBSDQt5.14" - "WindowsMSVCQt5.14" branchGroups: - "kf5-qt5" - "stable-kf5-qt5" "Calligra": includes: - repositories: - "calligra/kexi" - "extragear/libs/kdb" - "extragear/libs/kproperty" - "extragear/libs/kreport" - "extragear/graphics/kdiagram" platforms: - "SUSEQt5.12" - "FreeBSDQt5.14" - "WindowsMSVCQt5.14" - repositories: - "calligra/calligra" - "calligra/calligraplan" platforms: - "SUSEQt5.12" - "FreeBSDQt5.14" branchGroups: - "kf5-qt5" - "stable-kf5-qt5" diff --git a/local-metadata/project-ignore-rules.yaml b/local-metadata/project-ignore-rules.yaml index 4feae47..821922d 100644 --- a/local-metadata/project-ignore-rules.yaml +++ b/local-metadata/project-ignore-rules.yaml @@ -1,61 +1,64 @@ 'SUSEQt5.12': - 'kdesupport/qca' 'SUSEQt5.13': - 'kdesupport/qca' +'SUSEQt5.14': +- 'kdesupport/qca' + 'WindowsMSVCQt5.14': - 'kdesupport/polkit-qt-1' - 'kdesupport/qca' - 'frameworks/networkmanager-qt' - 'frameworks/modemmanager-qt' - 'frameworks/bluez-qt' - 'frameworks/prison' - 'frameworks/kdesu' - 'frameworks/kpty' - 'frameworks/kwayland' - 'frameworks/kactivities-stats' - 'kde/workspace/libksysguard' - 'kde/kdeedu/marble' - 'kde/kdenetwork/kaccounts-integration' - 'extragear/libs/pulseaudio-qt' 'FreeBSDQt5.14': - 'kdesupport/polkit-qt-1' - 'frameworks/networkmanager-qt' - 'frameworks/modemmanager-qt' - 'kde/workspace/plymouth-kcm' - 'kde/workspace/plasma-nm' - 'kde/workspace/plasma-vault' - 'kde/kdeedu/marble' - 'kde/kdegraphics/libs/libkgeomap' - 'kde/kdenetwork/kio-extras' 'AndroidQt5.14': - 'frameworks/kross' # ld: error: cannot find -lc++ - 'frameworks/polkit-qt-1' # requires glib2 - 'frameworks/kwallet' # requires gpgme - 'frameworks/kactivities' # requires boost - 'frameworks/kactivities-stats' # requires boost - 'frameworks/khtml' # requires kio - 'frameworks/kdelibs4support' # requires kio - 'frameworks/baloo' #kfilemetadata - 'frameworks/modemmanager-qt' - 'frameworks/networkmanager-qt' - 'frameworks/breeze-icons' # shouldn't be installed like we do for xdg, we have an ad-hoc solution in kirigami - 'frameworks/kjs' # looks like we need to switch to clang for this one >> https://github.com/android-ndk/ndk/issues/442 - 'frameworks/kpty' # Doesn't build, didn't investigate: kpty.cpp:587:35: error: 'getsid' was not declared in this scope - 'frameworks/kdesu' # requires kpty - 'frameworks/plasma-framework' # requires kactivities - 'frameworks/krunner' # requires plasma - 'frameworks/kwayland' # requires wayland - 'frameworks/kdoctools' # not very useful for Android - 'frameworks/kjsembed' # requires kjs - 'frameworks/kdesignerplugin' # requires kdoctools - 'frameworks/kdewebkit' # we don't have QtWebKitWidgets on the image - 'kde/kdenetwork/kaccounts-integration' #libaccounts isn't working, this is an integration framework, I don't think it makes sense there # to look into: - 'kde/kdegames/libkdegames' # needs openal - 'kde/kdegraphics/libs/libkexiv2' #has exiv2 external dependency - 'frameworks/kfilemetadata' # FIXME needs #include which can't be found ATM