diff options
| -rw-r--r-- | coin/instructions/coin_module_test_template_v2.yaml | 1 | ||||
| -rw-r--r-- | coin/instructions/coin_module_test_template_v3.yaml | 1 | ||||
| -rw-r--r-- | coin/instructions/run_schema_check.yaml | 44 |
3 files changed, 0 insertions, 46 deletions
diff --git a/coin/instructions/coin_module_test_template_v2.yaml b/coin/instructions/coin_module_test_template_v2.yaml index 3d3c8428648..ebc6b67327c 100644 --- a/coin/instructions/coin_module_test_template_v2.yaml +++ b/coin/instructions/coin_module_test_template_v2.yaml @@ -25,7 +25,6 @@ instructions: - condition: property property: target.osVersion in_values: [QEMU, QNX_710, QNX_800] - - !include "{{qt/qtbase}}/run_schema_check.yaml" disable_if: condition: or conditions: diff --git a/coin/instructions/coin_module_test_template_v3.yaml b/coin/instructions/coin_module_test_template_v3.yaml index 52e2f6a8992..14cf44699a1 100644 --- a/coin/instructions/coin_module_test_template_v3.yaml +++ b/coin/instructions/coin_module_test_template_v3.yaml @@ -26,7 +26,6 @@ instructions: - condition: property property: features contains_value: AndroidTestRun - - !include "{{qt/qtbase}}/run_schema_check.yaml" disable_if: condition: or conditions: diff --git a/coin/instructions/run_schema_check.yaml b/coin/instructions/run_schema_check.yaml deleted file mode 100644 index ff11ebdcc1b..00000000000 --- a/coin/instructions/run_schema_check.yaml +++ /dev/null @@ -1,44 +0,0 @@ -type: Group -instructions: - # Set the python executable according to the environment - - # Default value - type: EnvironmentVariable - variableName: SCHEMA_PYTHON_EXECUTABLE - variableValue: "python3" - - # Special case for Windows - type: EnvironmentVariable - variableName: SCHEMA_PYTHON_EXECUTABLE - # Reusing SBOM_PYTHON_APPS_PATH here because the requirements.txt is gated by it - variableValue: "{{.Env.SBOM_PYTHON_APPS_PATH}}\\..\\python.exe" - enable_if: - condition: property - property: host.os - equals_value: Windows - - # Special case for Rhel8 and other cases with too old python - type: EnvironmentVariable - variableName: SCHEMA_PYTHON_EXECUTABLE - variableValue: "python3.11" - enable_if: - condition: property - property: host.osVersion - in_values: [RHEL_8_8, RHEL_8_10, openSUSE_15_5, openSUSE_15_6] - - # Run schema check for host installation files - type: ExecuteCommand - command: "{{.Env.SCHEMA_PYTHON_EXECUTABLE}} {{.Env.LIBEXEC_INSTALL_DIR}}check_qt_module_json_schemas.py --install-prefix {{.Env.HOST_INSTALL_DIR}}" - userMessageOnFailure: &error-message | - Qt module json file schema validation failed. - To run locally, use `(pipx|uv|hatch) run qtbase/util/json_schema/check_qt_module_json_schemas.py` with appropriate --install-prefix - - # Run schema check for target installation files - type: ExecuteCommand - command: "{{.Env.SCHEMA_PYTHON_EXECUTABLE}} {{.Env.LIBEXEC_INSTALL_DIR}}check_qt_module_json_schemas.py --install-prefix {{.Env.TARGET_INSTALL_DIR}}" - userMessageOnFailure: *error-message -disable_if: - condition: and - conditions: - # Dependency check-jsonschema -> regress, but regress is not built for Windows ARM - - condition: property - property: host.os - equals_value: Windows - - condition: property - property: target.arch - equals_value: AARCH64 |