aboutsummaryrefslogtreecommitdiffstats
path: root/coin_build_instructions.py
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2018-06-21 21:36:20 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2018-06-22 09:02:44 +0000
commitf3b87fead2d4cb2a790f0709080551e252d5a46c (patch)
treead3fd2622d4d7181d860141420e5d9d0b877d182 /coin_build_instructions.py
parent87942459a27465439eb85d083545bfe0fddf2ff4 (diff)
Associate Coin snapshot builds with Coin integration IDs
This change adds a new setup.py option called --package-timestamp which allows setting the "dev" part of the version number of a snapshot package. It also modifies coin_build_instructions.py to set the package timestamp to the value of the Coin integration ID. This has a couple of benefits: 1) We can look up the build and test logs of a specific package on testresults.qt.io. This can also be looked up for non-snapshot builds, the "timestamp = Coin integration ID" can also be found in the generated __init__.py file. 2) All the different platform packages within one integration will have the same timestamp, which allows pinning snapshot packages inside a pipenv Pipfile. 3) It's easier to figure out which packages were built as part of the same Coin integration. Task-number: PYSIDE-680 Change-Id: Idb2f2d2313cee213a5d742f88b60315a4e505250 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'coin_build_instructions.py')
-rw-r--r--coin_build_instructions.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/coin_build_instructions.py b/coin_build_instructions.py
index c9d59a0a6..aee0bf265 100644
--- a/coin_build_instructions.py
+++ b/coin_build_instructions.py
@@ -55,6 +55,7 @@ CI_HOST_OS_VER = option_value("osVer")
CI_ENV_INSTALL_DIR = option_value("instdir")
CI_ENV_AGENT_DIR = option_value("agentdir")
CI_COMPILER = option_value("compiler")
+CI_INTEGRATION_ID = option_value("coinIntegrationId")
CI_FEATURES = []
_ci_features = option_value("features")
if _ci_features is not None:
@@ -118,6 +119,8 @@ def call_setup(python_ver):
if is_snapshot_build():
cmd += ["--snapshot-build"]
+ cmd += ["--package-timestamp=" + CI_INTEGRATION_ID]
+
run_instruction(cmd, "Failed to run setup.py")
def run_build_instructions():