diff options
| author | Antti Kokko <antti.kokko@qt.io> | 2021-06-28 15:11:57 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@qt.io> | 2021-07-01 06:45:29 +0000 |
| commit | ba7e4409df7b6f25e9d6c25aed9bbe35e15b8888 (patch) | |
| tree | 7c95c030dc11933b4a0dee0944b9964d2f74d6f8 | |
| parent | 509f5382843e1ec70647b46b69d4aa47ead1284a (diff) | |
release_repo_updater.py: support prerelease tag in snapshot upload pathv6.2.0-beta1
Optional parameter.
Change-Id: Ifd397b2c793e02adf351b0a69e7f75e250cd37b6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
| -rwxr-xr-x | packaging-tools/qt6_installer/release_repo_updater.py | 2 | ||||
| -rwxr-xr-x | packaging-tools/qt6_installer/release_task_reader.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/packaging-tools/qt6_installer/release_repo_updater.py b/packaging-tools/qt6_installer/release_repo_updater.py index 70a49499b..4207bd13d 100755 --- a/packaging-tools/qt6_installer/release_repo_updater.py +++ b/packaging-tools/qt6_installer/release_repo_updater.py @@ -695,7 +695,7 @@ def upload_snapshots_to_remote(staging_server: str, remote_upload_path: str, tas snapshot_path = get_pkg_value("SNAPSHOT_PATH") else: snapshot_path = os.path.join(base, project_name) - snapshot_upload_path = os.path.join(snapshot_path, version_minor, version_full, installer_build_id) + snapshot_upload_path = os.path.join(snapshot_path, version_minor, version_full + task.get_prerelease_version(), installer_build_id) remote_installer_path = os.path.join(remote_upload_path, installer_filename) if platform.system() == "Windows": # commands are run in Linux, adjust the upload paths diff --git a/packaging-tools/qt6_installer/release_task_reader.py b/packaging-tools/qt6_installer/release_task_reader.py index b6c5c0bc0..e3a4f320e 100755 --- a/packaging-tools/qt6_installer/release_task_reader.py +++ b/packaging-tools/qt6_installer/release_task_reader.py @@ -53,6 +53,7 @@ class ReleaseTask: self.config_file = settings["config_file"] self.project_name = settings.get("project_name", "") self.version = settings.get("version", "") + self.prerelease_version = settings.get("prerelease_version", "") self.substitutions = settings.get("substitutions", "") self.repo_path = settings.get("repo_path", "") self.repo_components_to_update = settings.get("repo_components_to_update", "") @@ -96,6 +97,9 @@ class ReleaseTask: def get_version(self) -> str: return self.version + def get_prerelease_version(self) -> str: + return self.prerelease_version.strip() + def get_repo_path(self) -> str: return self.repo_path |