Commit 4f168f95 authored by Ben Cooksley's avatar Ben Cooksley

FreeBSD is upgrading to Qt 5.12

parent 58628d3c
......@@ -9,11 +9,10 @@ server:
archiveDirectory: "/srv/production/"
cacheLocation:
WindowsMSVCQt5.10: "C:\\CI\\archives\\WindowsMSVCQt5.10\\"
WindowsMSVCQt5.11: "C:\\CI\\archives\\WindowsMSVCQt5.11\\"
SUSEQt5.9: "/srv/archives/production/SUSEQt5.9/"
SUSEQt5.10: "/srv/archives/production/SUSEQt5.10/"
SUSEQt5.11: "/srv/archives/production/SUSEQt5.11/"
FreeBSDQt5.11: "/usr/home/jenkins/archives/production/"
FreeBSDQt5.12: "/usr/home/jenkins/archives/production/"
AndroidQt5.11: "/srv/archives/production/AndroidQt5.11/"
ABIReference: "/srv/archives/production/ABIReference"
......@@ -9,11 +9,10 @@ server:
archiveDirectory: "/srv/sandbox/"
cacheLocation:
WindowsMSVCQt5.10: "C:\\CI\\sandbox-archives\\WindowsMSVCQt5.10\\"
WindowsMSVCQt5.11: "C:\\CI\\sandbox-archives\\WindowsMSVCQt5.11\\"
SUSEQt5.9: "/srv/archives/sandbox/SUSEQt5.9/"
SUSEQt5.10: "/srv/archives/sandbox/SUSEQt5.10/"
SUSEQt5.11: "/srv/archives/sandbox/SUSEQt5.11/"
FreeBSDQt5.11: "/usr/home/jenkins/archives/sandbox/"
FreeBSDQt5.12: "/usr/home/jenkins/archives/sandbox/"
AndroidQt5.11: "/srv/archives/sandbox/AndroidQt5.11/"
ABIReference: "/srv/archives/sandbox/ABIReference/"
......@@ -4,9 +4,9 @@ def knownStructure = new groovy.json.JsonSlurper().parseText( structureToParse )
// Prepare a list of supported OSes for later use
def supportedOSes = [
'Linux': '.* SUSEQt5.[9|10|11]$',
'FreeBSD': '.* FreeBSDQt5.11$',
'Windows': '.* WindowsMSVCQt5.[10|11]$'
'Linux': '.* SUSEQt5.[0-9]+$',
'FreeBSD': '.* FreeBSDQt5.12$',
'Windows': '.* WindowsMSVCQt5.[0-9]+$'
]
// Setup a view for each OS we support
......
......@@ -14,8 +14,7 @@ allPlatforms = {
'SUSEQt5.9': 'Linux',
'SUSEQt5.10': 'Linux',
'SUSEQt5.11': 'Linux',
'FreeBSDQt5.11': 'FreeBSD',
'WindowsMSVCQt5.10': 'Windows',
'FreeBSDQt5.12': 'FreeBSD',
'WindowsMSVCQt5.11': 'Windows',
None: 'MacOSX',
'AndroidQt5.11': 'Android'
......
......@@ -2,11 +2,11 @@
variables:
PRODUCT: Applications
freebsd kf5-qt5 qt5.11:
freebsd kf5-qt5 qt5.12:
extends: .freebsd
only:
- master
- merge_requests
variables:
PLATFORM: FreeBSDQt5.11
PLATFORM: FreeBSDQt5.12
BRANCH_GROUP: kf5-qt5
......@@ -2,11 +2,11 @@
variables:
PRODUCT: Frameworks
freebsd kf5-qt5 qt5.11:
freebsd kf5-qt5 qt5.12:
extends: .freebsd
only:
- master
- merge_requests
variables:
PLATFORM: FreeBSDQt5.11
PLATFORM: FreeBSDQt5.12
BRANCH_GROUP: kf5-qt5
......@@ -6,7 +6,7 @@
- "SUSEQt5.9"
- "SUSEQt5.11"
- "WindowsMSVCQt5.11"
- "FreeBSDQt5.11"
- "FreeBSDQt5.12"
- repositories:
- "frameworks/extra-cmake-modules"
- "frameworks/karchive"
......@@ -45,7 +45,7 @@
- "frameworks/plasma-framework"
platforms:
- "SUSEQt5.11"
- "FreeBSDQt5.11"
- "FreeBSDQt5.12"
branchGroups:
- "kf5-qt5"
- "stable-kf5-qt5"
......@@ -74,7 +74,7 @@
- "kde/pim/*"
platforms:
- "SUSEQt5.10"
- "FreeBSDQt5.11"
- "FreeBSDQt5.12"
- repositories:
- "kde/applications/baloo-widgets"
- "kde/applications/dolphin"
......@@ -165,7 +165,7 @@
- "kdereview/plasma-active-window-control"
platforms:
- "SUSEQt5.10"
- "FreeBSDQt5.11"
- "FreeBSDQt5.12"
- repositories:
- "extragear/base/atcore"
- "extragear/network/kdeconnect-kde"
......@@ -187,7 +187,7 @@
platforms:
- "SUSEQt5.10"
- "WindowsMSVCQt5.11"
- "FreeBSDQt5.11"
- "FreeBSDQt5.12"
branchGroups:
- "kf5-qt5"
- "stable-kf5-qt5"
......@@ -234,7 +234,7 @@
- "playground/devtools/plugins/kdev-*"
platforms:
- "SUSEQt5.10"
- "FreeBSDQt5.11"
- "FreeBSDQt5.12"
- "WindowsMSVCQt5.11"
branchGroups:
- "kf5-qt5"
......@@ -252,7 +252,7 @@
- "extragear/graphics/kdiagram"
platforms:
- "SUSEQt5.10"
- "FreeBSDQt5.11"
- "FreeBSDQt5.12"
- "WindowsMSVCQt5.11"
branchGroups:
- "kf5-qt5"
......
......@@ -21,7 +21,7 @@
- 'kde/workspace/libksysguard'
- 'kde/kdenetwork/kaccounts-integration'
'FreeBSDQt5.11':
'FreeBSDQt5.12':
- 'kdesupport/polkit-qt-1'
- 'frameworks/networkmanager-qt'
- 'frameworks/modemmanager-qt'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment