General: Exclude Storybook's PageValildator to separate target in Makefile to mitigate QTBUG-92236

This workaround can be removed after full migration to Qt >= 5.15.4
This commit is contained in:
Michał Cieślak 2023-10-18 09:51:13 +02:00 committed by Michał
parent bfcf891e49
commit 5d0466b627
2 changed files with 20 additions and 1 deletions

View File

@ -360,7 +360,12 @@ run-storybook: storybook-build
run-storybook-tests: storybook-build run-storybook-tests: storybook-build
echo -e "\033[92mRunning:\033[39m Storybook Tests" echo -e "\033[92mRunning:\033[39m Storybook Tests"
ctest -V --test-dir $(STORYBOOK_BUILD_PATH) ctest -V --test-dir $(STORYBOOK_BUILD_PATH) -E PagesValidator
# repeat because of https://bugreports.qt.io/browse/QTBUG-92236 (Qt < 5.15.4)
run-storybook-pages-validator: storybook-build
echo -e "\033[92mRunning:\033[39m Storybook Pages Validator"
ctest -V --test-dir $(STORYBOOK_BUILD_PATH) -R PagesValidator --repeat until-pass:3
storybook-clean: storybook-clean:
echo -e "\033[92mCleaning:\033[39m Storybook" echo -e "\033[92mCleaning:\033[39m Storybook"

View File

@ -103,6 +103,20 @@ pipeline {
} } } }
} }
stage('Check Storybook Pages Validator') {
steps { script {
/* Needed for QGuiApplication to import QtQuick.Dialogs */
wrap([
$class: 'Xvfb',
autoDisplayName: true,
parallelBuild: true,
screen: '2560x1440x24',
]) {
sh('make run-storybook-pages-validator')
}
} }
}
stage('Upload') { stage('Upload') {
steps { script { steps { script {
env.PKG_URL = "${currentBuild.absoluteUrl}/consoleText" env.PKG_URL = "${currentBuild.absoluteUrl}/consoleText"