diff options
author | Michael Fellinger <m.fellinger@gmail.com> | 2020-04-21 22:29:01 +0200 |
---|---|---|
committer | Milan <me@pbb.lc> | 2020-04-27 10:31:36 +0200 |
commit | 4c26ab4198b083f0647f1c0e64f985e211beff8f (patch) | |
tree | 8f12e5b63848c05420d2340ed8af79ee52ca5a1a /pkgs/applications/version-management/gitlab | |
parent | 412bb5e04dd405c2d4822c0eadff269f573e33a0 (diff) |
gitlab: update.py: invoke bundle lock manually
`bundix -l` doesn't work, as it treats bundler's warning about upgrading the lockfile version as an error, so invoke `bundle lock` manually.
Diffstat (limited to 'pkgs/applications/version-management/gitlab')
-rwxr-xr-x | pkgs/applications/version-management/gitlab/update.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 86ef1e9736cca..a128fd5bc4097 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -135,6 +135,7 @@ def update_rubyenv(): with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) + subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) @@ -174,6 +175,7 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitaly_server_version}")) + subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) os.environ['GOROOT'] = "" |