diff options
| author | Patrik Teivonen <patrik.teivonen@qt.io> | 2023-05-02 10:26:07 +0300 |
|---|---|---|
| committer | Patrik Teivonen <patrik.teivonen@qt.io> | 2023-08-18 05:13:26 +0000 |
| commit | 10760b074be82a99a69208fe87701e455566087f (patch) | |
| tree | 771abced9b9026372f42a37788997e63cbb4009f /coin/instructions | |
| parent | 4ea5135296ec81c67e5738f2d50ab6f78d6b54c6 (diff) | |
Coin: Switch to the new packaging tools scripts location
Scripts were moved from qtsdk.git to tqtc-qtsdk.git.
Adjust the coin instructions to use the new location.
This will also update the packaging scripts, so the new macOS
version with Xcode 13+ must be in use before it can be merged.
With the new scripts in use, the .dmg disk image will be
signed in addition to the .app bundle by default.
Also, the notarization tool is switched from soon to be
deprecated 'altool' to the new 'notarytool'.
Task-number: QTQAINFRA-5505
Change-Id: I63046761eb19e833eed414e19c17402a5694b556
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'coin/instructions')
| -rw-r--r-- | coin/instructions/common_environment.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/make_instructions.yaml | 7 | ||||
| -rw-r--r-- | coin/instructions/qmake_module_build.yaml | 7 |
3 files changed, 7 insertions, 11 deletions
diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index 108211f69..f0739ee3e 100644 --- a/coin/instructions/common_environment.yaml +++ b/coin/instructions/common_environment.yaml @@ -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/make_instructions.yaml b/coin/instructions/make_instructions.yaml index 22478eea5..ad2219edf 100644 --- a/coin/instructions/make_instructions.yaml +++ b/coin/instructions/make_instructions.yaml @@ -108,15 +108,18 @@ instructions: maxTimeInSeconds: 1800 maxTimeBetweenOutput: 600 userMessageOnFailure: "pkg_bootstrap.py failed" + - type: EnvironmentVariable + variableName: PKG_NODE_ROOT + variableValue: "{{.AgentWorkingDir}}/qtsdk" - type: ChangeDirectory - directory: "{{.AgentWorkingDir}}/qtsdk/qtsdk/packaging-tools" + directory: "{{.AgentWorkingDir}}/qtsdk/tqtc-qtsdk/packaging_tools" - type: ExecuteCommand command: "python3 -m pipenv run python sign_installer.py mac --file={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.7.0.app" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to sign the ifw installer" - type: ExecuteCommand - command: "python3 -m pipenv run python notarize.py --dmg={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.7.0.dmg" + command: "python3 -m pipenv run python notarize.py --path={{.SourceDir}}/IfwInstaller/QtInstallerFramework-macOS-x64-4.7.0.dmg" maxTimeInSeconds: 36000 maxTimeBetweenOutput: 3600 userMessageOnFailure: "Failed to notarize the ifw installer" diff --git a/coin/instructions/qmake_module_build.yaml b/coin/instructions/qmake_module_build.yaml index 7bb044a15..6eac528df 100644 --- a/coin/instructions/qmake_module_build.yaml +++ b/coin/instructions/qmake_module_build.yaml @@ -8,13 +8,6 @@ instructions: - type: InstallSourceArchive maxTimeInSeconds: 600 maxTimeBetweenOutput: 600 - project: qtsdk/qtsdk - ref: 8d9c6bb366b0f3c1e46c045a6453776ae98a8051 - directory: qtsdk/qtsdk - userMessageOnFailure: "Could not install qtsdk/qtsdk source archive. Please investigate why." - - type: InstallSourceArchive - maxTimeInSeconds: 600 - maxTimeBetweenOutput: 600 project: qtsdk/tqtc-qtsdk ref: master directory: qtsdk/tqtc-qtsdk |