diff options
| author | Simo Fält <simo.falt@qt.io> | 2022-05-25 15:40:53 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-10 08:36:21 +0000 |
| commit | 216ccd41dc7904f97f2dd8e337bdffea14731743 (patch) | |
| tree | 8a0841ab8504127ff6f6853626af70f2b82b8357 | |
| parent | 041bcede6b068672fa8d817b9977a3d1b4ff2462 (diff) | |
Be more precise with signing directory
Sign binaries only in 'package_for_wheels' directory. This will save
more than twenty minutes of overall build time with Win configs.
Change-Id: I3fe29a2e6854b9327c07b0eabba3a36bfd12d450
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit d95496865a8bb5fc535ccec208765971e57da339)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | coin/instructions/execute_build_instructions.yaml | 2 | ||||
| -rw-r--r-- | coin_build_instructions.py | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/coin/instructions/execute_build_instructions.yaml b/coin/instructions/execute_build_instructions.yaml index 71ed80172..ef63c6e22 100644 --- a/coin/instructions/execute_build_instructions.yaml +++ b/coin/instructions/execute_build_instructions.yaml @@ -61,7 +61,7 @@ instructions: userMessageOnFailure: > Failed to execute build instructions on Windows - type: SignPackage - directory: "{{.AgentWorkingDir}}\\pyside" + directory: "{{.AgentWorkingDir}}\\pyside\\pyside-setup\\build\\qfpa-p3.6\\package_for_wheels" maxTimeInSeconds: 1200 maxTimeBetweenOutput: 1200 enable_if: diff --git a/coin_build_instructions.py b/coin_build_instructions.py index 04b4e118a..1c4c10f2b 100644 --- a/coin_build_instructions.py +++ b/coin_build_instructions.py @@ -39,6 +39,7 @@ import calendar import datetime import os +import os.path import site import sys @@ -193,6 +194,11 @@ if __name__ == "__main__": if CI_TEST_PHASE in ["ALL", "BUILD"]: call_setup(python_ver, "BUILD") + # Until CI has a feature to set more dynamic signing dir, make sure it actually exist + if os.environ.get("QTEST_ENVIRONMENT") == "ci" and sys.platform == "win32": + signing_dir = os.path.join(os.getcwd(), "build", "qfpa-p3.6", "package_for_wheels") + print("Check for signing dir " + signing_dir) + assert(os.path.isdir(signing_dir)) if CI_TEST_PHASE in ["ALL", "WHEEL"]: call_setup(python_ver, "WHEEL") |