From 117935b6a171801cf8ce69f92e7a38cb32c5e41e Mon Sep 17 00:00:00 2001 From: Matthew Fernandez Date: Sat, 30 Jan 2021 13:02:11 -0800 Subject: [PATCH] reorder version computation steps in deployment --- ci/deploy.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ci/deploy.py b/ci/deploy.py index 9b841c135..04796f5fd 100644 --- a/ci/deploy.py +++ b/ci/deploy.py @@ -102,12 +102,6 @@ def main(args: [str]) -> int: log.error('release-cli not found') return -1 - # the generic package version has to be \d+.\d+.\d+ but it does not need to - # correspond to the release version (which may not conform to this pattern if - # this is a dev release), so generate a compliant generic package version - package_version = f'0.0.{int(os.environ["CI_COMMIT_SHA"], 16)}' - log.info(f'using generated generic package version {package_version}') - # retrieve version name left by prior CI tasks log.info('reading VERSION') with open('VERSION') as f: @@ -118,6 +112,12 @@ def main(args: [str]) -> int: if options.version is None: options.version = gv_version + # the generic package version has to be \d+.\d+.\d+ but it does not need to + # correspond to the release version (which may not conform to this pattern if + # this is a dev release), so generate a compliant generic package version + package_version = f'0.0.{int(os.environ["CI_COMMIT_SHA"], 16)}' + log.info(f'using generated generic package version {package_version}') + # list of assets we have uploaded assets: [str] = [] -- 2.40.0