summaryrefslogtreecommitdiffstats
path: root/coin
diff options
context:
space:
mode:
Diffstat (limited to 'coin')
-rw-r--r--coin/dependencies.yaml32
-rw-r--r--coin/instructions/common_environment.yaml10
-rw-r--r--coin/instructions/execute_license_check.yaml2
-rw-r--r--coin/instructions/make_instructions.yaml61
-rw-r--r--coin/instructions/make_win_docs_instructions.yaml2
-rw-r--r--coin/instructions/qmake_module_build.yaml8
-rw-r--r--coin/module_config.yaml2
-rw-r--r--coin/product_dependencies.yaml3
8 files changed, 82 insertions, 38 deletions
diff --git a/coin/dependencies.yaml b/coin/dependencies.yaml
index 036e121e8..4b7ff4b29 100644
--- a/coin/dependencies.yaml
+++ b/coin/dependencies.yaml
@@ -1,13 +1,19 @@
-
-product_dependency:
- ../../qt/qt5:
- ref: "ifw-5.12.11"
-dependency_source: supermodule
-dependencies: [
- "../../qt/qtbase",
- "../../qt/qtsvg",
- "../../qt/qtdeclarative",
- "../../qt/qttools",
- "../../qt/qttranslations",
- "../../qt/qtwinextras"
- ]
+dependencies:
+ ../../qt/qtbase.git:
+ ref: "33f5e985e480283bb0ca9dea5f82643e825ba87c"
+ required: true
+ ../../qt/qtsvg.git:
+ ref: "da7e04eaa56c54d5486e39d2e0bd0ddb2a62b74b"
+ required: true
+ ../../qt/qtdeclarative.git:
+ ref: "e559d5cf2b66c4a973f83f173d57676a21d287ef"
+ required: true
+ ../../qt/qttools.git:
+ ref: "d7c950e5cfcda823544d3a0092a2bf435015f94d"
+ required: true
+ ../../qt/qttranslations.git:
+ ref: "94e46555acd71eb7d14dc340b623c13876101c00"
+ required: true
+ ../../qt/qt5compat.git:
+ ref: "e1fe0c83bc547ba34142c2ab06fdfea0bced7308"
+ required: true
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml
index 989351a82..f0739ee3e 100644
--- a/coin/instructions/common_environment.yaml
+++ b/coin/instructions/common_environment.yaml
@@ -76,7 +76,7 @@ instructions:
- type: PrependToEnvironmentVariable
variableName: INCLUDE
- variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.11;C:\\Utils\\xz-5.2.5\\src\\liblzma\\api;"
+ variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\xz-5.2.5-x64\\src\\liblzma\\api;"
enable_if:
condition: property
property: host.os
@@ -84,11 +84,11 @@ instructions:
- type: PrependToEnvironmentVariable
variableName: LIB
- variableValue: "C:\\Utils\\bzip2-1.0.8;C:\\Utils\\zlib-1.2.11;C:\\Utils\\xz-5.2.5\\windows\\vs2015\\ReleaseMT\\Win32\\liblzma;"
+ variableValue: "C:\\Utils\\bzip2-1.0.8-x64;C:\\Utils\\xz-5.2.5-x64\\windows\\vs2019\\ReleaseMT\\x64\\liblzma;"
enable_if:
condition: property
property: target.compiler
- equals_value: MSVC2015
+ equals_value: MSVC2019
- type: Group
instructions:
@@ -105,5 +105,5 @@ instructions:
- type: Group
instructions:
- type: EnvironmentVariable
- variableName: PACKAGING_KEYS_CONFIG_URL
- variableValue: "http://ci-files01-hki.intra.qt.io/input/semisecure/packaging/packaging_secure.ini"
+ variableName: CI
+ variableValue: "true"
diff --git a/coin/instructions/execute_license_check.yaml b/coin/instructions/execute_license_check.yaml
index 603201a93..f5d2852f2 100644
--- a/coin/instructions/execute_license_check.yaml
+++ b/coin/instructions/execute_license_check.yaml
@@ -11,7 +11,7 @@ instructions:
maxTimeInSeconds: 600
maxTimeBetweenOutput: 600
project: qt/qtbase
- ref: 5.12.7
+ ref: 5.15.2
directory: qt/qtbase
userMessageOnFailure: "Could not install qt/base source archive. Please investigate why."
- type: ChangeDirectory
diff --git a/coin/instructions/make_instructions.yaml b/coin/instructions/make_instructions.yaml
index 2d2041f6d..dc29df9c4 100644
--- a/coin/instructions/make_instructions.yaml
+++ b/coin/instructions/make_instructions.yaml
@@ -77,13 +77,13 @@ instructions:
- type: ChangeDirectory
directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
- type: ExecuteCommand
- command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-x64-4.2.0.run"
+ command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-x64-5.0.0.run"
maxTimeInSeconds: 36000
maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to create ifw installer."
- type: Rename
- sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-x64-4.2.0.run"
- targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-x64-4.2.0.run"
+ sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-x64-5.0.0.run"
+ targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-x64-5.0.0.run"
userMessageOnFailure: "Failed to copy installer."
enable_if:
condition: and
@@ -91,32 +91,67 @@ instructions:
- condition: property
property: host.os
equals_value: Linux
+ - condition: property
+ property: target.arch
+ equals_value: X86_64
+
+ - type: Group
+ instructions:
+ - type: ChangeDirectory
+ directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
+ - type: ExecuteCommand
+ command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-linux-aarch64-5.0.0.run"
+ maxTimeInSeconds: 36000
+ maxTimeBetweenOutput: 3600
+ userMessageOnFailure: "Failed to create ifw installer."
+ - type: Rename
+ sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-linux-aarch64-5.0.0.run"
+ targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-linux-aarch64-5.0.0.run"
+ userMessageOnFailure: "Failed to copy installer."
+ enable_if:
+ condition: and
+ conditions:
+ - condition: property
+ property: host.os
+ equals_value: Linux
+ - condition: property
+ property: target.arch
+ equals_value: AARCH64
- type: Group
instructions:
- type: ChangeDirectory
directory: "{{.InstallRoot}}/{{.AgentWorkingDir}}"
- type: ExecuteCommand
- command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-macOS-x64-4.2.0.app"
+ command: "python3 {{.SourceDir}}/coin/create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir {{.SourceDir}}/IfwInstaller --target-name QtInstallerFramework-macOS-x64-5.0.0.app"
maxTimeInSeconds: 36000
maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to create ifw installer."
+ - type: ChangeDirectory
+ directory: "{{.AgentWorkingDir}}/qtsdk"
+ - type: ExecuteCommand
+ command: "python3 tqtc-qtsdk/jenkins-templates/jenkins/scripts/pkg_bootstrap.py"
+ maxTimeInSeconds: 1800
+ maxTimeBetweenOutput: 600
+ userMessageOnFailure: "pkg_bootstrap.py failed"
- type: EnvironmentVariable
- variableName: QT_CODESIGN_IDENTITY_KEY
- variableValue: "A5GTH44LYL"
+ variableName: PKG_NODE_ROOT
+ variableValue: "{{.AgentWorkingDir}}/qtsdk"
+ - type: ChangeDirectory
+ directory: "{{.AgentWorkingDir}}/qtsdk/tqtc-qtsdk/packaging_tools"
- type: ExecuteCommand
- command: "{{.AgentWorkingDir}}/qtsdk/qtsdk/packaging-tools/sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.2.0.app"
+ command: "python3 -m pipenv run python sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-5.0.0.app"
maxTimeInSeconds: 36000
maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to sign the ifw installer"
- type: ExecuteCommand
- command: "{{.AgentWorkingDir}}/qtsdk/qtsdk/packaging-tools/notarize.py --dmg={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.2.0.dmg"
+ command: "python3 -m pipenv run python notarize.py --path={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-5.0.0.dmg"
maxTimeInSeconds: 36000
maxTimeBetweenOutput: 3600
userMessageOnFailure: "Failed to notarize the ifw installer"
- type: Rename
- sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.2.0.dmg"
- targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-macOS-x64-4.2.0.dmg"
+ sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-5.0.0.dmg"
+ targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-macOS-x64-5.0.0.dmg"
userMessageOnFailure: "Failed to copy installer."
enable_if:
condition: and
@@ -130,7 +165,7 @@ instructions:
- type: ChangeDirectory
directory: "{{.SourceDir}}"
- type: ExecuteCommand
- command: "{{.Env.PYTHON3_PATH}}\\python {{.SourceDir}}\\coin\\create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir C:\\{{.SourceDir}}\\IfwInstaller --target-name QtInstallerFramework-windows-x86-4.2.0"
+ command: "{{.Env.PYTHON3_PATH}}\\python {{.SourceDir}}\\coin\\create_ifw_installer.py --src-dir {{.SourceDir}} --bld-dir {{.SourceDir}} --target-dir C:\\{{.SourceDir}}\\IfwInstaller --target-name QtInstallerFramework-windows-x64-5.0.0"
maxTimeInSeconds: 1200
maxTimeBetweenOutput: 1200
userMessageOnFailure: "Failed to create ifw installer."
@@ -151,8 +186,8 @@ instructions:
equals_value: Windows
- type: Rename
- sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x86-4.2.0.exe"
- targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x86-4.2.0.exe"
+ sourcePath: "{{.SourceDir}}/IfwInstaller/QtInstallerFramework-windows-x64-5.0.0.exe"
+ targetPath: "{{.InstallRoot}}/{{.AgentWorkingDir}}/QtInstallerFramework-windows-x64-5.0.0.exe"
userMessageOnFailure: "Failed to copy installer."
enable_if:
condition: property
diff --git a/coin/instructions/make_win_docs_instructions.yaml b/coin/instructions/make_win_docs_instructions.yaml
index 5d5f28f67..ab281501a 100644
--- a/coin/instructions/make_win_docs_instructions.yaml
+++ b/coin/instructions/make_win_docs_instructions.yaml
@@ -3,7 +3,7 @@ instructions:
- type: Group
instructions:
- type: ChangeDirectory
- directory: "{{.SourceDir}}\\doc"
+ directory: "{{.SourceDir}}"
maxTimeInSeconds: 300
maxTimeBetweenOutput: 120
userMessageOnFailure: "Failed to change dir"
diff --git a/coin/instructions/qmake_module_build.yaml b/coin/instructions/qmake_module_build.yaml
index 023927567..3a7801b20 100644
--- a/coin/instructions/qmake_module_build.yaml
+++ b/coin/instructions/qmake_module_build.yaml
@@ -8,10 +8,10 @@ instructions:
- type: InstallSourceArchive
maxTimeInSeconds: 600
maxTimeBetweenOutput: 600
- project: qtsdk/qtsdk
- ref: master
- directory: qtsdk/qtsdk
- userMessageOnFailure: "Could not install qtsdk/qtsdk source archive. Please investigate why."
+ project: qtsdk/tqtc-qtsdk
+ ref: production
+ directory: qtsdk/tqtc-qtsdk
+ userMessageOnFailure: "Could not install qtsdk/tqtc-qtsdk source archive. Please investigate why."
- type: SetBuildDirectory
directory: "{{.SourceDir}}"
diff --git a/coin/module_config.yaml b/coin/module_config.yaml
index c0e84c92d..558036480 100644
--- a/coin/module_config.yaml
+++ b/coin/module_config.yaml
@@ -56,7 +56,7 @@ run_license_check: &run_license_check
maxTimeInSeconds: 600
maxTimeBetweenOutput: 600
project: qt/qtbase
- ref: 5.12
+ ref: 5.15
directory: qt/qtbase
userMessageOnFailure: "Could not install qt/base source archive. Please investigate why."
- type: ChangeDirectory
diff --git a/coin/product_dependencies.yaml b/coin/product_dependencies.yaml
new file mode 100644
index 000000000..b9ccf5020
--- /dev/null
+++ b/coin/product_dependencies.yaml
@@ -0,0 +1,3 @@
+dependencies:
+ ../../qt/tqtc-qt5.git:
+ ref: "tqtc/6.6.0"
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 15:42:00 +0000