diff options
| author | Olivier De Cannière <olivier.decanniere@qt.io> | 2023-05-04 10:31:12 +0200 |
|---|---|---|
| committer | Olivier De Cannière <olivier.decanniere@qt.io> | 2023-05-04 14:01:25 +0200 |
| commit | b153740606956da52ace34a43214b8c70dff5f9e (patch) | |
| tree | e7fef08838cfebe090034ccfae7e1898fd092353 /coin | |
| parent | 757f50166b5186a1fcfb5e7e5737801f094fda1b (diff) | |
QmlDom: Remove the standalone version of QmlDom
Change-Id: I2582f3ca0217ec9791ead71393cfa506c28086b8
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/coin_dom_standalone_old_qt_mac.yaml | 69 | ||||
| -rw-r--r-- | coin/instructions/coin_dom_standalone_old_qt_win.yaml | 75 | ||||
| -rw-r--r-- | coin/module_config.yaml | 2 |
3 files changed, 0 insertions, 146 deletions
diff --git a/coin/instructions/coin_dom_standalone_old_qt_mac.yaml b/coin/instructions/coin_dom_standalone_old_qt_mac.yaml deleted file mode 100644 index d0a265a763..0000000000 --- a/coin/instructions/coin_dom_standalone_old_qt_mac.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 https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/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 https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/qtbase/qtbase-MacOS-MacOS_12-Clang-MacOS-MacOS_12-X86_64-ARM64.7z failed - - type: ExecuteCommand - command: "curl -s https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/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 https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/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.5 failed - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build standalone63" - ignoreExitCode: false - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 1800 - userMessageOnFailure: > - Compilation of qmldom standalone on Qt 6.5 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.5 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 deleted file mode 100644 index 47320c278f..0000000000 --- a/coin/instructions/coin_dom_standalone_old_qt_win.yaml +++ /dev/null @@ -1,75 +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 https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/qtbase/qtbase-Windows-Windows_10_22H2-MSVC2019-Windows-Windows_10_22H2-X86_64.7z -o qtbase.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - download of https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/qtbase/qtbase-Windows-Windows_10_22H2-MSVC2019-Windows-Windows_10_22H2-X86_64.7z failed - - type: ExecuteCommand - command: "curl -s https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/qtdeclarative/qtdeclarative-Windows-Windows_10_22H2-MSVC2019-Windows-Windows_10_22H2-X86_64.7z -o qtdeclarative.7z" - ignoreExitCode: false - maxTimeInSeconds: 1800 - maxTimeBetweenOutput: 900 - userMessageOnFailure: > - Download of https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.0-beta2-released/Qt/qtdeclarative/qtdeclarative-Windows-Windows_10_22H2-MSVC2019-Windows-Windows_10_22H2-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.5 failed - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --build standalone63" - ignoreExitCode: false - maxTimeInSeconds: 3600 - maxTimeBetweenOutput: 1800 - userMessageOnFailure: > - Compilation of qmldom standalone on Qt 6.5 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.5 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 23f6189286..9acb62722c 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -17,5 +17,3 @@ 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_mac.yaml" - - !include "{{qt/qtdeclarative}}/coin_dom_standalone_old_qt_win.yaml" |
