Skip to content
Snippets Groups Projects
Commit 2940975a authored by Amir MOHAMMADI's avatar Amir MOHAMMADI
Browse files

Fix software release process

parent 602a7fdd
No related branches found
No related tags found
No related merge requests found
Pipeline #49664 failed
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
add log output instead add log output instead
- bob.measure!86 Fix decimal number control for metrics: Fixes - bob.measure!86 Fix decimal number control for metrics: Fixes
bob.measure#52 bob.measure#52
- bob.measure!88 Fix tests: Should fix bob.nightlies#40 - bob.measure!88 Fix tests: Should fix nightlies#40
- bob.measure!67 Titles: Allow list of titles and remove `(development)` - bob.measure!67 Titles: Allow list of titles and remove `(development)`
`(evaluation)` when default titles are modified `(evaluation)` when default titles are modified
- bob.measure!45 Condapackage - bob.measure!45 Condapackage
......
...@@ -196,6 +196,10 @@ def get_parsed_tag(gitpkg, tag): ...@@ -196,6 +196,10 @@ def get_parsed_tag(gitpkg, tag):
# increase the version accordingly # increase the version accordingly
major, minor, patch = latest_tag_name.split(".") major, minor, patch = latest_tag_name.split(".")
# handle alpha and beta version
if "a" in patch or "b" in patch:
patch = patch.split("a")[0].split("b")[0]
patch = int(patch) - 1
if "major" == tag: if "major" == tag:
# increment the first number in 'v#.#.#' but make minor and patch # increment the first number in 'v#.#.#' but make minor and patch
...@@ -510,7 +514,7 @@ def release_package(gitpkg, tag_name, tag_comments_list, dry_run=False): ...@@ -510,7 +514,7 @@ def release_package(gitpkg, tag_name, tag_comments_list, dry_run=False):
# commit and push changes # commit and push changes
update_files_at_master( update_files_at_master(
gitpkg, gitpkg,
{"README.rst": readme_content, "version.txt": version_number}, {"README.rst": readme_content, "version.txt": version_number + "\n"},
"Increased stable version to %s" % version_number, "Increased stable version to %s" % version_number,
dry_run, dry_run,
) )
......
...@@ -38,7 +38,7 @@ Examples: ...@@ -38,7 +38,7 @@ Examples:
5. Generates a complete list of changelogs for a list of packages (one per line): 5. Generates a complete list of changelogs for a list of packages (one per line):
\b \b
$ bdt gitlab getpath bob/bob.nightlies order.txt $ bdt gitlab getpath bob/nightlies order.txt
$ bdt gitlab lasttag bob/bob $ bdt gitlab lasttag bob/bob
# copy and paste date to next command # copy and paste date to next command
$ bdt gitlab changelog -vvv --since="2018-07-17 10:23:40" order.txt changelog.md $ bdt gitlab changelog -vvv --since="2018-07-17 10:23:40" order.txt changelog.md
......
...@@ -16,14 +16,14 @@ logger = get_logger(__name__) ...@@ -16,14 +16,14 @@ logger = get_logger(__name__)
epilog=""" epilog="""
Examples: Examples:
1. Get the file ``order.txt`` from bob.nightlies master branch: 1. Get the file ``order.txt`` from nightlies master branch:
$ bdt gitlab getpath bob/bob.nightlies order.txt $ bdt gitlab getpath bob/nightlies order.txt
2. Get the file ``order.txt`` from a different branch ``2.x``: 2. Get the file ``order.txt`` from a different branch ``2.x``:
$ bdt gitlab getpath --ref=2.x bob/bob.nightlies order.txt $ bdt gitlab getpath --ref=2.x bob/nightlies order.txt
3. Get the directory ``gitlab`` (and eventual sub-directories) from bob.admin, save outputs in directory ``_ci``: 3. Get the directory ``gitlab`` (and eventual sub-directories) from bob.admin, save outputs in directory ``_ci``:
......
...@@ -23,11 +23,11 @@ Examples: ...@@ -23,11 +23,11 @@ Examples:
1. Process all the jobs from a particular pipeline 1. Process all the jobs from a particular pipeline
$ bdt gitlab process-pipelines bob/bob.nightlies pipelines $ bdt gitlab process-pipelines bob/nightlies pipelines
2. Process a particular job from a pipeline 2. Process a particular job from a pipeline
$ bdt gitlab process-pipelines bob/bob.nightlies pipelines --job-id xxx $ bdt gitlab process-pipelines bob/nightlies pipelines --job-id xxx
""" """
) )
...@@ -97,7 +97,7 @@ Examples: ...@@ -97,7 +97,7 @@ Examples:
1. Get the most recent pipelines from a particular project wit their corresponding job numbers 1. Get the most recent pipelines from a particular project wit their corresponding job numbers
$ bdt gitlab get-pipelines bob/bob.nightlies $ bdt gitlab get-pipelines bob/nightlies
""" """
......
...@@ -33,7 +33,7 @@ def update_bob(stable): ...@@ -33,7 +33,7 @@ def update_bob(stable):
gl = get_gitlab_instance() gl = get_gitlab_instance()
# download order.txt form bob.nightlies and get the list of packages # download order.txt form nightlies and get the list of packages
nightlies = gl.projects.get("bob/nightlies") nightlies = gl.projects.get("bob/nightlies")
with tempfile.NamedTemporaryFile() as f: with tempfile.NamedTemporaryFile() as f:
......
...@@ -27,7 +27,7 @@ Examples: ...@@ -27,7 +27,7 @@ Examples:
2. Checks the visibility of all packages in a file list: 2. Checks the visibility of all packages in a file list:
\b \b
$ bdt gitlab getpath bob/bob.nightlies order.txt $ bdt gitlab getpath bob/nightlies order.txt
$ bdt gitlab visibility order.txt $ bdt gitlab visibility order.txt
""" """
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment