diff --git a/archive-configs/production.yaml b/archive-configs/production.yaml index 232576d..5d2b75c 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.11: "C:\\CI\\archives\\WindowsMSVCQt5.11\\" SUSEQt5.10: "/srv/archives/production/SUSEQt5.10/" SUSEQt5.11: "/srv/archives/production/SUSEQt5.11/" + SUSEQt5.12: "/srv/archives/production/SUSEQt5.12/" FreeBSDQt5.12: "/usr/home/jenkins/archives/production/" AndroidQt5.11: "/srv/archives/production/AndroidQt5.11/" ABIReference: "/srv/archives/production/ABIReference" diff --git a/archive-configs/sandbox.yaml b/archive-configs/sandbox.yaml index f2a0a2f..4acc9b6 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.11: "C:\\CI\\sandbox-archives\\WindowsMSVCQt5.11\\" SUSEQt5.10: "/srv/archives/sandbox/SUSEQt5.10/" SUSEQt5.11: "/srv/archives/sandbox/SUSEQt5.11/" + SUSEQt5.12: "/srv/archives/sandbox/SUSEQt5.12/" FreeBSDQt5.12: "/usr/home/jenkins/archives/sandbox/" AndroidQt5.11: "/srv/archives/sandbox/AndroidQt5.11/" ABIReference: "/srv/archives/sandbox/ABIReference/" diff --git a/helpers/check-platform.py b/helpers/check-platform.py index 6f53677..ca7acbe 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.10': 'Linux', 'SUSEQt5.11': 'Linux', + 'SUSEQt5.12': 'Linux', 'FreeBSDQt5.12': 'FreeBSD', 'WindowsMSVCQt5.11': 'Windows', None: 'MacOSX', 'AndroidQt5.11': '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.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/project-ignore-rules.yaml b/local-metadata/project-ignore-rules.yaml index b2916c8..75e529a 100644 --- a/local-metadata/project-ignore-rules.yaml +++ b/local-metadata/project-ignore-rules.yaml @@ -1,61 +1,64 @@ 'SUSEQt5.10': - 'kdesupport/qca' 'SUSEQt5.11': - 'kdesupport/qca' +'SUSEQt5.12': +- 'kdesupport/qca' + 'WindowsMSVCQt5.11': - '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/kdenetwork/kaccounts-integration' 'FreeBSDQt5.12': - 'kdesupport/polkit-qt-1' - 'frameworks/networkmanager-qt' - 'frameworks/modemmanager-qt' - 'kde/workspace/plymouth-kcm' - 'kde/workspace/plasma-nm' - 'kde/workspace/powerdevil' - 'kde/workspace/plasma-vault' - 'kde/kdeedu/marble' - 'kde/kdegraphics/libs/libkgeomap' - 'kde/kdenetwork/kio-extras' 'AndroidQt5.11': - 'kdesupport/phonon' - '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/purpose' # requires kio - '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 # 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 - 'kde/pim/kcalcore' # libical master doesn't build