From 412bb5e04dd405c2d4822c0eadff269f573e33a0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 20 Apr 2020 17:09:02 +0200 Subject: gitlab: support passing --rev to the `update-all` script While it's already possible to invoke `update-data` with the `--rev` argument, one still needs to run all later phases manually. Fix this, by having `update-all` also accept a `--rev` argument, and pass it down to `update-data`. Also, make the help text a bit more usable, by suggesting the usual versioning scheme used these times. --- pkgs/applications/version-management/gitlab/update.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs') diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index a2a3a6d05b7e..86ef1e9736cc 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -100,7 +100,7 @@ def cli(): @cli.command('update-data') -@click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') def update_data(rev: str): """Update data.nix""" repo = GitLabRepo() @@ -227,10 +227,11 @@ def update_gitlab_workhorse(): os.unlink(gitlab_workhorse_dir / fn) @cli.command('update-all') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context -def update_all(ctx): +def update_all(ctx, rev: str): """Update all gitlab components to the latest stable release""" - ctx.invoke(update_data, rev='latest') + ctx.invoke(update_data, rev=rev) ctx.invoke(update_rubyenv) ctx.invoke(update_yarnpkgs) ctx.invoke(update_gitaly) -- cgit 1.4.1