summary refs log tree commit diff
path: root/pkgs/applications/version-management/gitlab/update.py
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2019-07-16 01:18:11 +0200
committerRobin Gloster <mail@glob.in>2019-07-16 01:18:11 +0200
commit722ee7756b9b0eb807fec9e7c48074c381982c13 (patch)
tree7818967f50767cc67f5535155669dde52342a3e6 /pkgs/applications/version-management/gitlab/update.py
parent6c98b0ff434c9234d6ca59e52a48db704b4a34db (diff)
downloadnixpkgs-722ee7756b9b0eb807fec9e7c48074c381982c13.tar
nixpkgs-722ee7756b9b0eb807fec9e7c48074c381982c13.tar.gz
nixpkgs-722ee7756b9b0eb807fec9e7c48074c381982c13.tar.bz2
nixpkgs-722ee7756b9b0eb807fec9e7c48074c381982c13.tar.lz
nixpkgs-722ee7756b9b0eb807fec9e7c48074c381982c13.tar.xz
nixpkgs-722ee7756b9b0eb807fec9e7c48074c381982c13.tar.zst
nixpkgs-722ee7756b9b0eb807fec9e7c48074c381982c13.zip
gitlab: add gitaly `go mod` handling for the updater
Diffstat (limited to 'pkgs/applications/version-management/gitlab/update.py')
-rwxr-xr-xpkgs/applications/version-management/gitlab/update.py16
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py
index ae1f0ad4c50..650bd73aa84 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
+#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix
 
 import click
 import click_log
@@ -194,13 +194,21 @@ def update_gitaly():
     data = _get_data_json()
     gitaly_server_version = data['ce']['passthru']['GITALY_SERVER_VERSION']
     r = GitLabRepo('gitlab-org', 'gitaly')
-    rubyenv_dir = pathlib.Path(__file__).parent / 'gitaly'
+    gitaly_dir = pathlib.Path(__file__).parent / 'gitaly'
 
     for fn in ['Gemfile.lock', 'Gemfile']:
-        with open(rubyenv_dir / fn, 'w') as f:
+        with open(gitaly_dir / fn, 'w') as f:
             f.write(r.get_file(f"ruby/{fn}", f"v{gitaly_server_version}"))
 
-    subprocess.check_output(['bundix'], cwd=rubyenv_dir)
+    for fn in ['go.mod', 'go.sum']:
+        with open(gitaly_dir / fn, 'w') as f:
+            f.write(r.get_file(fn, f"v{gitaly_server_version}"))
+
+    subprocess.check_output(['bundix'], cwd=gitaly_dir)
+    subprocess.check_output(['vgo2nix'], cwd=gitaly_dir)
+
+    for fn in ['go.mod', 'go.sum']:
+        os.unlink(gitaly_dir / fn)
     # currently broken, as `gitaly.meta.position` returns
     # pkgs/development/go-modules/generic/default.nix
     # so update-source-version doesn't know where to update hashes