From 11dcad85e9def95774c1e6f1db5f68c9d9fbe750 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 25 Jul 2024 13:19:36 +0200 Subject: [PATCH] coin: Run license check from qtqa/dev for all of qt5.git/dev Currently any configuration tagged with the 'LicenseCheck' feature uses the qtqa/master tst_licenses.pl script for license checking. The exact instructions that are run are hard-coded in the Coin repository. This is inflexible, and also confusing because qtqa has a dev and a master branch, and people forget to cherry-pick changes to the master branch. Furthermore always using the qtqa/master branch for all qt5.git branches is limiting, because no instruction changes can be made to a specific qt5.git branch. Using the new instructions added in qtbase commit 2a0e89981a52633c497f62bad0c7d26c466493cb we can now tag configurations with the 'LicenseCheckV2' feature. Integrations will then use the instructions from the active qtbase SHA1 to run the license check. Currently the qtbase instructions will always use the qtqa/dev branch for the license check, for both the dev and 6.8 branches, but in the near future we will likely want to create versioned branches for the qtqa repo, just like the rest of our repositories, so that we can have specific license check instructions for specific branches. Task-number: QTBUG-124453 Task-number: QTBUG-125211 Task-number: QTBUG-125569 Task-number: QTQAINFRA-3935 Change-Id: Ica024dec44a9581c49cdfb555ba93667f7b34780 Reviewed-by: Toni Saario Reviewed-by: Lucie Gerard (cherry picked from commit 0055441fc71792714a81710fa4d6e32ad76d4062) --- coin/platform_configs/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 082f9702..1ac6aa4b 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -4,9 +4,9 @@ Configurations: Id: 'ubuntu-22.04-license-check' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] + Features: ['TestOnly', 'LicenseCheckV2'] - Id: 'ubuntu-24.04-x64-license-check' Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] + Features: ['TestOnly', 'LicenseCheckV2']