6.5.3 clean

2025-07-02 07:15:27 +08:00 · 2023-11-01 18:02:52 +01:00
parent bbe896803b
commit 7018d9e6c8
2170 changed files with 57471 additions and 43550 deletions
--- a/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts_host.yaml
@ -13,6 +13,11 @@ instructions:
        variableValue: "{{.Env.COMMON_TEST_CMAKE_ARGS}}"
      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
    disable_if:
-      condition: property
-      property: features
-      contains_value: DisableTests
+      condition: or
+      conditions:
+        - condition: property
+          property: features
+          contains_value: DisableTests
+        - condition: property
+          property: features
+          contains_value: DoNotBuildTests
--- a/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml
+++ b/coin/instructions/cmake_build_and_upload_test_artifacts_target.yaml
@ -34,6 +34,11 @@ instructions:
        variableValue: "{{.Env.COMMON_TARGET_TEST_CMAKE_ARGS}}"
      - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
    disable_if:
-      condition: property
-      property: features
-      contains_value: DisableTests
+      condition: or
+      conditions:
+        - condition: property
+          property: features
+          contains_value: DisableTests
+        - condition: property
+          property: features
+          contains_value: DoNotBuildTests
--- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@ -61,9 +61,14 @@ instructions:
            - condition: property
              property: host.os
              equals_value: Windows
-            - condition: property
-              property: target.osVersion
-              not_in_values: [WebAssembly, Android_ANY]
+            - condition: and
+              conditions:
+                - condition: property
+                  property: target.os
+                  not_equals_value: QNX
+                - condition: property
+                  property: target.osVersion
+                  not_in_values: [WebAssembly, Android_ANY]
      - type: EnvironmentVariable
        variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
        variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}host{{.Env.CI_PATH_SEP}}bin"
@ -73,9 +78,14 @@ instructions:
            - condition: property
              property: host.os
              equals_value: Windows
-            - condition: property
-              property: target.osVersion
-              not_in_values: [WebAssembly, Android_ANY]
+            - condition: and
+              conditions:
+                - condition: property
+                  property: target.os
+                  not_equals_value: QNX
+                - condition: property
+                  property: target.osVersion
+                  not_in_values: [WebAssembly, Android_ANY]
      - !include "{{qt/qtbase}}/call_host_install.yaml"
      - type: EnvironmentVariable
        variableName: DESTDIR
@ -123,9 +133,14 @@ instructions:
        - condition: property
          property: host.os
          equals_value: Windows
-        - condition: property
-          property: target.osVersion
-          not_in_values: [WebAssembly, Android_ANY]
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
  - type: EnvironmentVariable
    variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
    variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}target{{.Env.CI_PATH_SEP}}bin"
@ -135,9 +150,14 @@ instructions:
        - condition: property
          property: host.os
          equals_value: Windows
-        - condition: property
-          property: target.osVersion
-          not_in_values: [WebAssembly, Android_ANY]
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
  - !include "{{qt/qtbase}}/call_target_install.yaml"
  - type: EnvironmentVariable
    variableName: DESTDIR
--- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml
@ -47,9 +47,14 @@ instructions:
            - condition: property
              property: host.os
              equals_value: Windows
-            - condition: property
-              property: target.osVersion
-              not_in_values: [WebAssembly, Android_ANY]
+            - condition: and
+              conditions:
+                - condition: property
+                  property: target.os
+                  not_equals_value: QNX
+                - condition: property
+                  property: target.osVersion
+                  not_in_values: [WebAssembly, Android_ANY]
      - type: EnvironmentVariable
        variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
        variableValue: "{{.BuildDir}}{{.Env.CI_PATH_SEP}}bin"
@ -59,9 +64,14 @@ instructions:
            - condition: property
              property: host.os
              equals_value: Windows
-            - condition: property
-              property: target.osVersion
-              not_in_values: [WebAssembly, Android_ANY]
+            - condition: and
+              conditions:
+                - condition: property
+                  property: target.os
+                  not_equals_value: QNX
+                - condition: property
+                  property: target.osVersion
+                  not_in_values: [WebAssembly, Android_ANY]
      - !include "{{qt/qtbase}}/call_host_install.yaml"
      - type: EnvironmentVariable
        variableName: DESTDIR
@ -124,9 +134,14 @@ instructions:
        - condition: property
          property: host.os
          equals_value: Windows
-        - condition: property
-          property: target.osVersion
-          not_in_values: [WebAssembly, Android_ANY]
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
  - type: EnvironmentVariable
    variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
    variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
@ -136,9 +151,14 @@ instructions:
        - condition: property
          property: host.os
          equals_value: Windows
-        - condition: property
-          property: target.osVersion
-          not_in_values: [WebAssembly, Android_ANY]
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
  - !include "{{qt/qtbase}}/call_target_install.yaml"
  - type: EnvironmentVariable
    variableName: DESTDIR
--- a/coin/instructions/cmake_qtbase_build_instructions.yaml
+++ b/coin/instructions/cmake_qtbase_build_instructions.yaml
@ -41,9 +41,14 @@ instructions:
        - condition: property
          property: host.os
          equals_value: Windows
-        - condition: property
-          property: target.osVersion
-          not_in_values: [WebAssembly, Android_ANY]
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
  - type: EnvironmentVariable
    variableName: COIN_CMAKE_BUILD_LIBEXEC_DIR
    variableValue: "{{.Env.COIN_CMAKE_BUILD_DIR}}{{.Env.CI_PATH_SEP}}bin"
@ -53,9 +58,14 @@ instructions:
        - condition: property
          property: host.os
          equals_value: Windows
-        - condition: property
-          property: target.osVersion
-          not_in_values: [WebAssembly, Android_ANY]
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
  - !include "{{qt/qtbase}}/call_host_install.yaml"
  - type: EnvironmentVariable
    variableName: DESTDIR
--- a/coin/instructions/prepare_building_env.yaml
+++ b/coin/instructions/prepare_building_env.yaml
@ -305,6 +305,14 @@ instructions:
        condition: property
        property: target.osVersion
        in_values: [QEMU]
+    # This fixes an issue where binfmts is sometimes disabled on the test VMs
+    - type: ExecuteCommand
+      command: sudo update-binfmts --enable
+      userMessageOnFailure: "Failed to enable binfmts"
+      enable_if:
+        condition: property
+        property: target.osVersion
+        equals_value: QEMU

  # Windows on Arm, cross-compilation with MSVC
  - type: Group