From 1cfd3c932f4bd37557c2e46ac7e377ecf41cae6c Mon Sep 17 00:00:00 2001 From: Fawzi Mohamed Date: Tue, 5 Jul 2022 13:54:50 +0200 Subject: qmldom: use a snapshot which has the Q_QML_COMPILER_EXPORT rename Change-Id: Icc64ab98b1e0a578f310b2e75c5db95b73db4ada Reviewed-by: Tim Jenssen Reviewed-by: Qt CI Bot --- coin/instructions/coin_dom_standalone_old_qt.yaml | 69 -------------------- .../coin_dom_standalone_old_qt_mac.yaml | 69 ++++++++++++++++++++ .../coin_dom_standalone_old_qt_win.yaml | 75 ++++++++++++++++++++++ coin/module_config.yaml | 3 +- 4 files changed, 146 insertions(+), 70 deletions(-) delete mode 100644 coin/instructions/coin_dom_standalone_old_qt.yaml create mode 100644 coin/instructions/coin_dom_standalone_old_qt_mac.yaml create mode 100644 coin/instructions/coin_dom_standalone_old_qt_win.yaml (limited to 'coin') diff --git a/coin/instructions/coin_dom_standalone_old_qt.yaml b/coin/instructions/coin_dom_standalone_old_qt.yaml deleted file mode 100644 index adae9ad8b6..0000000000 --- a/coin/instructions/coin_dom_standalone_old_qt.yaml +++ /dev/null @@ -1,69 +0,0 @@ -type: Group -instructions: - - type: SetBuildDirectory - directory: "{{.SourceDir}}/examples/qml/qmldom" - - type: MakeDirectory - directory: "{{.BuildDir}}/qt63" - - type: ChangeDirectory - directory: "{{.BuildDir}}/qt63" - - type: EnvironmentVariable - variableName: CONFIGURE_ENV_PREFIX - variableValue: "{{.Env.ENV_PREFIX}}" - - type: ExecuteCommand - command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.1-final-released/Qt6.3.1/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtbase.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.1-final-released/Qt6.3.1/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed - - type: ExecuteCommand - command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.1-final-released/Qt6.3.1/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtdeclarative.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qt/6.3/6.3.1-final-released/Qt6.3.1/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed - - type: ExecuteCommand - command: "7za x qtbase.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Uncompress of qtbase failed. - - type: ExecuteCommand - command: "7za x qtdeclarative.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Uncompress of qtdeclarative failed. - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake -S {{.SourceDir}}/examples/qml/qmldom -B standalone63 -DCMAKE_PREFIX_PATH={{.BuildDir}}/qt63" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - configuration of qmldom standalone on Qt 6.3 failed - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build standalone63" - ignoreExitCode: false - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 1800 - userMessageOnFailure: > - Compilation of qmldom standalone on Qt 6.3 FAILED, see the log for details. - - type: ExecuteCommand - command: "./standalone63/qmldomloadeditwrite" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Run of qmldom standalone on Qt 6.3 FAILED -enable_if: - condition: and - conditions: - - condition: property - property: target.arch - contains_value: X86_64 - - condition: property - property: target.os - contains_value: MacOS diff --git a/coin/instructions/coin_dom_standalone_old_qt_mac.yaml b/coin/instructions/coin_dom_standalone_old_qt_mac.yaml new file mode 100644 index 0000000000..d562fc4699 --- /dev/null +++ b/coin/instructions/coin_dom_standalone_old_qt_mac.yaml @@ -0,0 +1,69 @@ +type: Group +instructions: + - type: SetBuildDirectory + directory: "{{.SourceDir}}/examples/qml/qmldom" + - type: MakeDirectory + directory: "{{.BuildDir}}/qt63" + - type: ChangeDirectory + directory: "{{.BuildDir}}/qt63" + - type: EnvironmentVariable + variableName: CONFIGURE_ENV_PREFIX + variableValue: "{{.Env.ENV_PREFIX}}" + - type: ExecuteCommand + command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtbase.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed + - type: ExecuteCommand + command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z -o qtdeclarative.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtdeclarative/qtdeclarative-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed + - type: ExecuteCommand + command: "7za x qtbase.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Uncompress of qtbase failed. + - type: ExecuteCommand + command: "7za x qtdeclarative.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Uncompress of qtdeclarative failed. + - type: ExecuteCommand + command: "{{.Env.ENV_PREFIX}} cmake -S {{.SourceDir}}/examples/qml/qmldom -B standalone63 -DCMAKE_PREFIX_PATH={{.BuildDir}}/qt63" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + configuration of qmldom standalone on Qt 6.3 failed + - type: ExecuteCommand + command: "{{.Env.ENV_PREFIX}} cmake --build standalone63" + ignoreExitCode: false + maxTimeInSeconds: 3600 + maxTimeBetweenOutput: 1800 + userMessageOnFailure: > + Compilation of qmldom standalone on Qt 6.3 FAILED, see the log for details. + - type: ExecuteCommand + command: "./standalone63/qmldomloadeditwrite" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Run of qmldom standalone on Qt 6.3 FAILED +enable_if: + condition: and + conditions: + - condition: property + property: target.arch + contains_value: X86_64 + - condition: property + property: target.os + contains_value: MacOS diff --git a/coin/instructions/coin_dom_standalone_old_qt_win.yaml b/coin/instructions/coin_dom_standalone_old_qt_win.yaml new file mode 100644 index 0000000000..12826af613 --- /dev/null +++ b/coin/instructions/coin_dom_standalone_old_qt_win.yaml @@ -0,0 +1,75 @@ +type: Group +instructions: + - type: SetBuildDirectory + directory: "{{.SourceDir}}/examples/qml/qmldom" + - type: MakeDirectory + directory: "{{.BuildDir}}/qt63" + - type: ChangeDirectory + directory: "{{.BuildDir}}/qt63" + - type: EnvironmentVariable + variableName: CONFIGURE_ENV_PREFIX + variableValue: "{{.Env.ENV_PREFIX}}" + - type: ExecuteCommand + command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtbase/qtbase-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z -o qtbase.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtbase/qtbase-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z failed + - type: ExecuteCommand + command: "curl -s http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtdeclarative/qtdeclarative-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z -o qtdeclarative.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Download of http://ci-files02-hki.intra.qt.io/packages/jenkins/archive/qtdesignstudio/qt_63_snapshot_to_test_qmldom_standalone/qtdeclarative/qtdeclarative-Windows-Windows_10_21H2-MSVC2019-Windows-Windows_10_21H2-X86_64.7z failed + - type: ExecuteCommand + command: "7z.exe x qtbase.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Uncompress of qtbase failed. + - type: ExecuteCommand + command: "7z.exe x qtdeclarative.7z" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Uncompress of qtdeclarative failed. + - type: ExecuteCommand + command: "{{.Env.ENV_PREFIX}} cmake -S {{.SourceDir}}/examples/qml/qmldom -B standalone63 -DCMAKE_PREFIX_PATH={{.BuildDir}}/qt63" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + configuration of qmldom standalone on Qt 6.3 failed + - type: ExecuteCommand + command: "{{.Env.ENV_PREFIX}} cmake --build standalone63" + ignoreExitCode: false + maxTimeInSeconds: 3600 + maxTimeBetweenOutput: 1800 + userMessageOnFailure: > + Compilation of qmldom standalone on Qt 6.3 FAILED, see the log for details. + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "{{.BuildDir}}/qt63/bin;" + - type: ExecuteCommand + command: "./standalone63/qmldomloadeditwrite" + ignoreExitCode: false + maxTimeInSeconds: 1800 + maxTimeBetweenOutput: 900 + userMessageOnFailure: > + Run of qmldom standalone on Qt 6.3 FAILED +enable_if: + condition: and + conditions: + - condition: property + property: target.arch + contains_value: X86_64 + - condition: property + property: target.os + contains_value: Windows + - condition: property + property: target.compiler + contains_value: MSVC diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 893dd49d75..c9282358ae 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -11,4 +11,5 @@ instructions: Test: - !include "{{qt/qtbase}}/coin_module_test_template_v3.yaml" - !include "{{qt/qtbase}}/coin_module_test_docs.yaml" - - !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt.yaml" + - !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt_mac.yaml" + - !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt_win.yaml" -- cgit v1.2.1