diff options
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/dependencies.yaml | 40 | ||||
| -rw-r--r-- | coin/instructions/common_environment.yaml | 206 | ||||
| -rw-r--r-- | coin/instructions/execute_android_instructions.yaml | 73 | ||||
| -rw-r--r-- | coin/instructions/execute_build_instructions.yaml | 67 | ||||
| -rw-r--r-- | coin/instructions/execute_desktop_instructions.yaml | 128 | ||||
| -rw-r--r-- | coin/instructions/execute_license_check.yaml | 2 | ||||
| -rw-r--r-- | coin/instructions/execute_test_instructions.yaml | 84 | ||||
| -rw-r--r-- | coin/instructions/find_path_to_msvc_compiler.yaml | 7 | ||||
| -rw-r--r-- | coin/module_config.yaml | 106 |
9 files changed, 624 insertions, 89 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml new file mode 100644 index 000000000..fda1681cd --- /dev/null +++ b/coin/dependencies.yaml @@ -0,0 +1,40 @@ +product_dependency: + ../../qt/qt5: + ref: "6.7" +dependency_source: supermodule +dependencies: [ + "../../qt/qt3d", + "../../qt/qt5compat", + "../../qt/qtactiveqt", + "../../qt/qtbase", + "../../qt/qtcharts", + "../../qt/qtconnectivity", + "../../qt/qtdatavis3d", + "../../qt/qtdeclarative", + "../../qt/qtdoc", + "../../qt/qtgraphs", + "../../qt/qthttpserver", + "../../qt/qtimageformats", + "../../qt/qtlocation", + "../../qt/qtpositioning", + "../../qt/qtmultimedia", + "../../qt/qtnetworkauth", + "../../qt/qtqa", + "../../qt/qtquick3d", + "../../qt/qtquicktimeline", + "../../qt/qtremoteobjects", + "../../qt/qtscxml", + "../../qt/qtsensors", + "../../qt/qtserialbus", + "../../qt/qtserialport", + "../../qt/qtshadertools", + "../../qt/qtspeech", + "../../qt/qtsvg", + "../../qt/qttools", + "../../qt/qttranslations", + "../../qt/qtvirtualkeyboard", + "../../qt/qtwayland", + "../../qt/qtwebchannel", + "../../qt/qtwebengine", + "../../qt/qtwebsockets" + ] diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 2c6603334..54b8de8e1 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -1,6 +1,28 @@ type: Group instructions: - type: EnvironmentVariable + variableName: QTEST_ENVIRONMENT + variableValue: "ci" + - type: EnvironmentVariable + variableName: PYSIDE_VIRTUALENV + variableValue: "{{.AgentWorkingDir}}\\pyside\\pyside-setup\\env" + enable_if: + condition: property + property: host.os + equals_value: Windows + - type: EnvironmentVariable + variableName: PYSIDE_VIRTUALENV + variableValue: "{{.AgentWorkingDir}}/pyside/pyside-setup/env" + enable_if: + condition: or + conditions: + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: host.os + equals_value: Linux + - type: EnvironmentVariable variableName: TARGET_ARCHITECTURE variableValue: amd64 enable_if: @@ -13,6 +35,18 @@ instructions: property: host.os equals_value: Windows - type: EnvironmentVariable + variableName: PYTHON3_PATH + variableValue: "{{ index .Env \"PYTHON3.10.0-64_PATH\"}}" + enable_if: + condition: and + conditions: + - condition: property + property: host.osVersion + equals_value: Windows_11_22H2 + - condition: property + property: host.os + equals_value: Windows + - type: EnvironmentVariable variableName: TARGET_ARCHITECTURE variableValue: amd64_x86 enable_if: @@ -46,6 +80,13 @@ instructions: property: features contains_value: Packaging - type: EnvironmentVariable + variableName: CI_USE_SCCACHE + variableValue: "--compiler-launcher=sccache" + enable_if: + condition: property + property: features + contains_value: Sccache + - type: EnvironmentVariable variableName: CI_OS variableValue: "MacOS" enable_if: @@ -82,6 +123,41 @@ instructions: equals_value: Windows - type: PrependToEnvironmentVariable variableName: PATH + variableValue: "{{.Env.PYTHON3_PATH}}/bin:" + enable_if: + condition: property + property: host.os + equals_value: MacOS + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "{{ index .Env \"PYTHON3.10.0-64_PATH\"}};" + enable_if: + condition: property + property: host.os + equals_value: Windows + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "/Users/qt/.local/bin/:" + enable_if: + condition: property + property: host.os + equals_value: MacOS + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "/Users/qt/work/install/bin:" + enable_if: + condition: property + property: host.os + equals_value: MacOS + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "/home/qt/work/install/bin:" + enable_if: + condition: property + property: host.os + equals_value: Linux + - type: PrependToEnvironmentVariable + variableName: PATH variableValue: "\\Users\\qt\\work\\install\\bin;" enable_if: condition: property @@ -115,3 +191,133 @@ instructions: condition: property property: target.compiler equals_value: ICC_18 + - type: EnvironmentVariable + variableName: LLVM_INSTALL_DIR + variableValue: "{{.Env.LLVM_DYNAMIC_LIBS_100}}" + disable_if: + condition: or + conditions: + - condition: and + conditions: + - condition: property + property: target.arch + equals_value: X86_64-ARM64 # When target arch is universal binary, we can use the default libclang + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: target.os + equals_value: Android + - type: ExecuteCommand + command: "sudo apt-get install python3-pip libclang-11-dev clang -y" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: host.arch + equals_value: AARCH64 + userMessageOnFailure: > + Failed to install dependencies + - type: ExecuteCommand + command: "python3 -m pip install -U setuptools==69.1.1" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: host.arch + equals_value: AARCH64 + userMessageOnFailure: > + Failed to install setuptools + - type: EnvironmentVariable + variableName: LLVM_INSTALL_DIR + variableValue: "/usr/lib/llvm-11/lib" + enable_if: + condition: and + conditions: + - condition: property + property: target.arch + equals_value: AARCH64 + - condition: property + property: host.os + equals_value: Linux + - type: EnvironmentVariable + variableName: interpreter + variableValue: "python3.11" + enable_if: + condition: property + property: host.osVersion + in_values: [RHEL_8_6, RHEL_8_8] + - type: EnvironmentVariable + variableName: interpreter + variableValue: "python3" + enable_if: # Enable for others than rhl 8.* + condition: property + property: host.osVersion + not_in_values: [RHEL_8_6, RHEL_8_8] + # ToDo: can be removed after 3.11 is available on qt5#3.8 on macOS + # start of ToDo + - type: ExecuteCommand + command: "tools/install-p311.sh" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: target.os + equals_value: Android + userMessageOnFailure: > + Failed to install python 3.11 + - type: PrependToEnvironmentVariable + variableName: PATH + variableValue: "/Users/qt/python311/bin:" + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: target.os + equals_value: Android + # end of ToDo + - type: ExecuteCommand + command: "virtualenv -p {{.Env.interpreter}} {{.AgentWorkingDir}}/env" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: or + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to create env + - type: EnvironmentVariable + variableName: ENV_PYTHON + variableValue: "{{.AgentWorkingDir}}/env/bin/python" + - type: AppendToEnvironmentVariable + variableName: PATH + variableValue: ":{{.AgentWorkingDir}}/env/bin/" + enable_if: # Enable for others than rhl 8.* + condition: property + property: target.os + equals_value: Android + + diff --git a/coin/instructions/execute_android_instructions.yaml b/coin/instructions/execute_android_instructions.yaml new file mode 100644 index 000000000..8a417c4af --- /dev/null +++ b/coin/instructions/execute_android_instructions.yaml @@ -0,0 +1,73 @@ +type: Group +instructions: + - type: ExecuteCommand + command: "{{.Env.interpreter}} -m pip install -r requirements.txt" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: or + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to install deps + - type: ExecuteCommand + command: "{{.Env.interpreter}} -m pip install -r tools/cross_compile_android/requirements.txt" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: or + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to install deps + - type: ExecuteCommand + command: "{{.Env.interpreter}} tools/cross_compile_android/main.py --qt-install-path /Users/qt/work/install --auto-accept-license --skip-update --verbose --ndk-path {{.Env.ANDROID_NDK_ROOT_DEFAULT}} --sdk-path {{.Env.ANDROID_SDK_ROOT}} --plat-name aarch64 --coin" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to execute build instructions on macOS + - type: ExecuteCommand + command: "{{.Env.interpreter}} tools/cross_compile_android/main.py --qt-install-path /home/qt/work/install --auto-accept-license --skip-update --verbose --ndk-path {{.Env.ANDROID_NDK_ROOT_DEFAULT}} --sdk-path {{.Env.ANDROID_SDK_ROOT}} --plat-name x86_64 --coin" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: target.arch + equals_value: X86_64 + userMessageOnFailure: > + Failed to execute build instructions on Linux + # ToDo: Do we need x86 build? + # - type: ExecuteCommand + # command: "{{.Env.interpreter}} tools/cross_compile_android/main.py --qt-install-path /home/qt/work/install --auto-accept-license --skip-update --verbose --ndk-path {{.Env.ANDROID_NDK_ROOT_DEFAULT}} --sdk-path {{.Env.ANDROID_SDK_ROOT}} --plat-name x86 --clean-cache all --coin" + # maxTimeInSeconds: 14400 + # maxTimeBetweenOutput: 1200 + # enable_if: + # condition: and + # conditions: + # - condition: property + # property: host.os + # equals_value: Linux + # - condition: property + # property: target.arch + # equals_value: X86 + # userMessageOnFailure: > + # Failed to execute build instructions on Linux diff --git a/coin/instructions/execute_build_instructions.yaml b/coin/instructions/execute_build_instructions.yaml index 1a0c73067..310f00e94 100644 --- a/coin/instructions/execute_build_instructions.yaml +++ b/coin/instructions/execute_build_instructions.yaml @@ -1,56 +1,21 @@ type: Group instructions: - - type: ExecuteCommand - command: "python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=ALL" - maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 1200 - enable_if: - condition: property - property: host.os - equals_value: MacOS - userMessageOnFailure: > - Failed to execute build instructions on osx - - type: ExecuteCommand - command: "python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/home/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=ALL" - maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 600 - enable_if: - condition: property - property: host.os - equals_value: Linux - userMessageOnFailure: > - Failed to execute build instructions on Linux - - type: ExecuteCommand - command: "c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=BUILD" - maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 600 - enable_if: - condition: property - property: host.os - equals_value: Windows - userMessageOnFailure: > - Failed to execute build instructions on Windows - - type: SignPackage - directory: "{{.AgentWorkingDir}}\\pyside" - maxTimeInSeconds: 1200 - maxTimeBetweenOutput: 1200 + - type: Group + instructions: + - !include "{{pyside/pyside-setup}}/execute_android_instructions.yaml" enable_if: condition: property - property: host.os - equals_value: Windows - - type: ChangeDirectory - directory: "{{.AgentWorkingDir}}\\pyside\\pyside-setup" - enable_if: - condition: property - property: host.os - equals_value: Windows - - type: ExecuteCommand - command: "c:\\users\\qt\\MSVC.bat python -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=WHEEL" - maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 300 + property: target.os + equals_value: Android + - type: Group + instructions: + - !include "{{pyside/pyside-setup}}/execute_desktop_instructions.yaml" enable_if: - condition: property - property: host.os - equals_value: Windows - userMessageOnFailure: > - Failed to create wheels for Windows + condition: and + conditions: + - condition: property + property: host.compiler + not_equals_value: Mingw + - condition: property + property: target.os + not_equals_value: Android diff --git a/coin/instructions/execute_desktop_instructions.yaml b/coin/instructions/execute_desktop_instructions.yaml new file mode 100644 index 000000000..95fa66151 --- /dev/null +++ b/coin/instructions/execute_desktop_instructions.yaml @@ -0,0 +1,128 @@ +type: Group +instructions: + - type: ExecuteCommand + command: "python3 -m pip install -U setuptools==67.7.2" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to install setuptools on macOS + - type: ExecuteCommand + command: "python3 -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} {{.Env.CI_USE_SCCACHE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=ALL" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: target.arch + equals_value: X86_64 + - condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to execute build instructions on macOS + - type: ExecuteCommand + command: "python3 -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} {{.Env.CI_USE_SCCACHE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch=X86_64-ARM64 --phase=ALL" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: target.arch + equals_value: X86_64-ARM64 + - condition: property + property: host.os + equals_value: MacOS + userMessageOnFailure: > + Failed to execute build instructions on macOS + - type: EnvironmentVariable + variableName: PYSIDE_SIGNING_DIR + variableValue: "{{.AgentWorkingDir}}\\pyside\\{{.Env.TESTED_MODULE_COIN}}\\build\\qfpa-p3.10\\package_for_wheels" + enable_if: + condition: property + property: host.os + equals_value: Windows + - type: ExecuteCommand + command: "{{.Env.interpreter}} -m pip install -U pip setuptools==67.7.2 --user" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: property + property: host.os + equals_value: Linux + userMessageOnFailure: > + Failed to install setuptools on Linux + - type: ExecuteCommand + command: "{{.Env.interpreter}} -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} {{.Env.CI_USE_SCCACHE}} --instdir=/home/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch={{.Env.HOST_ARCH_COIN}} --targetArch={{.Env.TARGET_ARCH_COIN}}--phase=ALL" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 600 + enable_if: + condition: property + property: host.os + equals_value: Linux + userMessageOnFailure: > + Failed to execute build instructions on Linux + - type: ExecuteCommand + command: "c:\\users\\qt\\MSVC.bat {{.Env.PYTHON3_PATH}}\\python.exe -m pip install -U setuptools==67.7.2" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: property + property: host.os + equals_value: Windows + userMessageOnFailure: > + Failed to install setuptools on Windows + - type: ExecuteCommand + command: "c:\\users\\qt\\MSVC.bat {{.Env.PYTHON3_PATH}}\\python.exe -u coin_build_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} {{.Env.CI_USE_SCCACHE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}} --phase=BUILD" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 600 + enable_if: + condition: property + property: host.os + equals_value: Windows + userMessageOnFailure: > + Failed to execute build instructions on Windows + - type: SignPackage + directory: "{{.Env.PYSIDE_SIGNING_DIR}}" + maxTimeInSeconds: 1200 + maxTimeBetweenOutput: 1200 + enable_if: + condition: property + property: host.os + equals_value: Windows + - type: ChangeDirectory + directory: "{{.AgentWorkingDir}}\\pyside\\pyside-setup" + enable_if: + condition: property + property: host.os + equals_value: Windows + - type: ExecuteCommand + command: "c:\\users\\qt\\MSVC.bat {{.Env.PYSIDE_VIRTUALENV}}\\Scripts\\python.exe create_wheels.py" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 300 + enable_if: + condition: property + property: host.os + equals_value: Windows + userMessageOnFailure: > + Failed to create wheels for Windows + - type: ExecuteCommand + command: "{{.Env.PYSIDE_VIRTUALENV}}/bin/python create_wheels.py" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 300 + enable_if: + condition: or + conditions: + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: host.os + equals_value: Linux + userMessageOnFailure: > + Failed to create wheels diff --git a/coin/instructions/execute_license_check.yaml b/coin/instructions/execute_license_check.yaml index 51027ba7d..0bf4d3ca1 100644 --- a/coin/instructions/execute_license_check.yaml +++ b/coin/instructions/execute_license_check.yaml @@ -6,7 +6,7 @@ instructions: maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 project: qt/qtbase - ref: 5.15 + ref: "CURRENT_BRANCH" directory: qt/qtbase userMessageOnFailure: > Could not install source archive. Please investigate why. diff --git a/coin/instructions/execute_test_instructions.yaml b/coin/instructions/execute_test_instructions.yaml index 22a980663..b963d77da 100644 --- a/coin/instructions/execute_test_instructions.yaml +++ b/coin/instructions/execute_test_instructions.yaml @@ -4,11 +4,8 @@ enable_if: property: features not_contains_value: LicenseCheck instructions: - - type: EnvironmentVariable - variableName: QTEST_ENVIRONMENT - variableValue: "ci" - type: ExecuteCommand - command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" + command: "python3 -m pip install -U setuptools==69.1.1" maxTimeInSeconds: 14400 maxTimeBetweenOutput: 1200 enable_if: @@ -16,24 +13,93 @@ instructions: property: host.os equals_value: MacOS userMessageOnFailure: > - Failed to execute test instructions on osx + Failed to install setuptools on macOS - type: ExecuteCommand - command: "python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/home/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" + command: "python3 -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=ARM64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" maxTimeInSeconds: 14400 - maxTimeBetweenOutput: 600 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: host.arch + equals_value: ARM64 + - condition: property + property: target.os + not_equals_value: Android + userMessageOnFailure: > + Failed to execute test instructions on arm mac + - type: ExecuteCommand + command: "python3 -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/Users/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: host.arch + equals_value: X86_64 + - condition: property + property: target.os + not_equals_value: Android + userMessageOnFailure: > + Failed to execute test instructions on macOS + - type: ExecuteCommand + command: "{{.Env.interpreter}} -m pip install -U pip setuptools==69.1.1 --user" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 enable_if: condition: property property: host.os equals_value: Linux userMessageOnFailure: > - Failed to execute test instructions on Linux + Failed to install setuptools on Linux - type: ExecuteCommand - command: "c:\\users\\qt\\MSVC.bat python -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" + command: "{{.Env.interpreter}} -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=/home/qt/work/install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" maxTimeInSeconds: 14400 maxTimeBetweenOutput: 600 enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: Linux + - condition: property + property: target.os + not_equals_value: Android + userMessageOnFailure: > + Failed to execute test instructions on Linux + - type: ExecuteCommand + command: "c:\\users\\qt\\MSVC.bat {{.Env.PYTHON3_PATH}}\\python.exe -m pip install -U pip setuptools==69.1.1 --user" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 1200 + enable_if: condition: property property: host.os equals_value: Windows userMessageOnFailure: > + Failed to install setuptools on Windows + - type: ExecuteCommand + command: "c:\\users\\qt\\MSVC.bat {{.Env.PYTHON3_PATH}}\\python.exe -u coin_test_instructions.py --os={{.Env.CI_OS}} {{.Env.CI_PACKAGING_FEATURE}} --instdir=c:\\Users\\qt\\work\\install --targetOs={{.Env.CI_OS}} --hostArch=X86_64 --targetArch={{.Env.CI_TARGET_ARCHITECTURE}}" + maxTimeInSeconds: 14400 + maxTimeBetweenOutput: 600 + enable_if: + condition: and + conditions: + - condition: property + property: host.os + equals_value: Windows + - condition: property + property: target.os + not_equals_value: Android + - condition: property + property: host.compiler + not_equals_value: Mingw + userMessageOnFailure: > Failed to execute test instructions on 64 bit Windows diff --git a/coin/instructions/find_path_to_msvc_compiler.yaml b/coin/instructions/find_path_to_msvc_compiler.yaml index 8f9bed82f..015a86eab 100644 --- a/coin/instructions/find_path_to_msvc_compiler.yaml +++ b/coin/instructions/find_path_to_msvc_compiler.yaml @@ -18,6 +18,13 @@ instructions: condition: property property: host.compiler equals_value: MSVC2019 + - type: EnvironmentVariable + variableName: VC_SCRIPT + variableValue: "\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\VC\\Auxiliary\\Build\\vcvarsall.bat" + enable_if: + condition: property + property: host.compiler + equals_value: MSVC2022 - type: WriteFile fileContents: "call \"{{.Env.VC_SCRIPT}}\" {{.Env.TARGET_ARCHITECTURE}} \r\ncmd /c %*" filename: "c:\\users\\qt\\MSVC.bat" diff --git a/coin/module_config.yaml b/coin/module_config.yaml index 772166fb5..6deb88fba 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -2,34 +2,84 @@ version: 2 accept_configuration: condition: or conditions: - - condition: and - conditions: - - condition: property # No cross compilation - property: host.os - equals_property: target.os - - condition: property # qtnamespace is not supported - property: configureArgs - not_contains_value: -qtnamespace - - condition: property # no-widgets is notsupported - property: configureArgs - not_contains_value: -no-widgets - - condition: property # no-gui is not supported - property: configureArgs - not_contains_value: -no-gui - - condition: property # Following configs are not supported - property: target.osVersion - not_in_values: [OPENSUSE_13_01, QEMU, WebAssembly, Ubuntu_18_04, SLES_12, SLES_15] - - condition: property # MibnGW and msvc2015 are not supported - property: target.compiler - not_in_values: [Mingw73, MSVC2015] - - condition: and - conditions: - - condition: property - property: target.osVersion - equals_value: Ubuntu_18_04 - - condition: property - property: features - contains_value: LicenseCheck + - condition: property + property: features + contains_value: LicenseCheck + - condition: and + conditions: + - condition: property # No cross compilation + property: host.os + equals_property: target.os + - condition: property + property: features + contains_value: Packaging + - condition: property + property: features + not_contains_value: UseLegacyInstructions + - condition: property # MinGW and msvc2015 are not supported + property: target.compiler + not_in_values: [Mingw, MSVC2015,Clang] + - condition: property # Webassembly + property: target.osVersion + not_equals_value: WebAssembly + - condition: property # Windows on Arm + property: target.arch + not_equals_value: ARM64 + - condition: property # Windows on Arm host build + property: target.arch + not_equals_value: AARCH64 + - condition: property + property: features + not_contains_value: DebianPackaging + - condition: property + property: target.osVersion + not_equals_value: VxWorks + - condition: and + conditions: + - condition: property + property: host.os + equals_value: MacOS + - condition: property + property: features + contains_value: TestOnly + - condition: property + property: features + contains_value: Packaging + - condition: property + property: target.os + not_contains_value: Android + - condition: property + property: target.os + not_contains_value: IOS + - condition: property + property: host.osVersion + not_equals_value: MacOS_12 + - condition: and # Restore LoA config + conditions: + - condition: property + property: host.osVersion + equals_value: Debian_11_6 + - condition: property + property: host.arch + equals_value: AARCH64 + - condition: property + property: features + not_contains_value: DebianPackaging + - condition: property + property: features + contains_value: Packaging + - condition: and + conditions: + - condition: property + property: target.os + equals_value: Android + - condition: property + property: features + contains_value: Packaging + +machine_type: + Build: + cores: 8 upload_pyside: &upload_pyside type: Group |