Skip to content

Commit

Permalink
gitlab: update.py: invoke bundle lock manually
Browse files Browse the repository at this point in the history
`bundix -l` doesn't work, as it treats bundler's warning about upgrading
the lockfile version as an error, so invoke `bundle lock` manually.

(cherry picked from commit 4c26ab4)
  • Loading branch information
manveru authored and flokli committed Apr 28, 2020
1 parent 68169a7 commit a7ceb25
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion 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-moretea.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-moretea.yarn2nix

import click
import click_log
Expand Down Expand Up @@ -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)


Expand Down Expand Up @@ -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'] = ""
Expand Down

0 comments on commit a7ceb25

Please sign in to comment.