From 3c5809cd755f94b7758b52769fb6ee397c81678e Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 31 Jan 2023 12:41:44 +0000 Subject: [PATCH] Coin: add branch and repo overrides for lts modules Until the opensource lts releases are pushed to code.qt.io, we need to override the git configurations to fetch the modules from the tqtc repos. This add the same configs as qt6-lts.inc did when the release was commercial-only, but only for the CI builds. Cherry-pick updated for 6.5 branch coin setup & added modules. Change-Id: I789b3600c3aa0a33beeff3cf895944fae51de86c Reviewed-by: Mikko Gronoff (cherry picked from commit dbbb59a2f550e0bd49e5547a8e7b344e67742a24) Reviewed-by: Samuli Piippo --- coin/module_config.yaml | 10 +++++----- coin/test-lts.inc | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 coin/test-lts.inc diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 4b09503..e499719 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -34,7 +34,7 @@ target1: &target1 variableValue: nanbield.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs wayland + variableValue: ci configs wayland lts enable_if: condition: property property: target.arch @@ -50,7 +50,7 @@ target2: &target2 variableValue: master.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs wayland mingw no-webengine + variableValue: ci configs wayland mingw no-webengine lts enable_if: condition: property property: target.arch @@ -66,7 +66,7 @@ target3: &target3 variableValue: mickledore.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs + variableValue: ci configs lts enable_if: condition: property property: target.arch @@ -82,7 +82,7 @@ target4: &target4 variableValue: dunfell.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs dunfell no-webengine + variableValue: ci configs dunfell no-webengine lts enable_if: condition: property property: target.arch @@ -98,7 +98,7 @@ target5: &target5 variableValue: kirkstone.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs wayland static no-webengine + variableValue: ci configs wayland static no-webengine lts enable_if: condition: property property: target.arch diff --git a/coin/test-lts.inc b/coin/test-lts.inc new file mode 100644 index 0000000..89d256e --- /dev/null +++ b/coin/test-lts.inc @@ -0,0 +1,19 @@ +python __anonymous () { + modules = [ + 'gn', 'qt3d', 'qt5compat', 'qtapplicationmanager', 'qtbase', 'qtcharts', + 'qtcoap', 'qtconnectivity', 'qtdatavis3d', 'qtdeclarative', 'qtdeviceutilities', + 'qtgrpc', 'qthttpserver', 'qtimageformats', 'qtinterfaceframework', 'qtlanguageserver', + 'qtlocation', 'qtlottie', 'qtmqtt', 'qtmultimedia', 'qtnetworkauth', 'qtopcua', + 'qtpositioning', 'qtquick3d', 'qtquick3dphysics', 'qtquicktimeline', 'qtremoteobjects', + 'qtscxml', 'qtsensors', 'qtserialbus', 'qtserialport', 'qtshadertools', 'qtspeech', + 'qtsvg', 'qttools', 'qttranslations', 'qtvirtualkeyboard', 'qtwayland', 'qtwebchannel', + 'qtwebengine', 'qtwebsockets', 'qtwebview' + ] + + module = d.getVar('BPN') + if module in modules: + d.setVar('QT_GIT', d.getVar('QT_COMMERCIAL_GIT')) + d.setVar('QT_GIT_PROTOCOL', d.getVar('QT_COMMERCIAL_GIT_PROTOCOL')) + d.setVar('QT_MODULE_REPO', 'tqtc-%s.git' % d.getVar('QT_MODULE')) + d.setVar('QT_MODULE_BRANCH', 'tqtc/lts-%s-opensource' % d.getVar('QT_MODULE_BRANCH')) +}