public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitlab: add back GITLAB_WORKHORSE_VERSION

Browse Source 
9b30cda2f6 (r49247855)
This commit is contained in:
Milan Pässler 2021-04-08 09:54:56 +02:00
parent a20d26806f
commit 35aca2bada
No known key found for this signature in database
GPG Key ID: A6DC6A7CB0B97859
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/applications/version-management/gitlab/data.json
View File

@ -7,6 +7,7 @@
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "13.10.2", "GITALY_SERVER_VERSION": "13.10.2",
"GITLAB_PAGES_VERSION": "1.36.0", "GITLAB_PAGES_VERSION": "1.36.0",
"GITLAB_SHELL_VERSION": "13.17.0" "GITLAB_SHELL_VERSION": "13.17.0",
"GITLAB_WORKHORSE_VERSION": "13.10.2"
} }
} }

5
pkgs/applications/version-management/gitlab/update.py
View File

@ -69,6 +69,9 @@ class GitLabRepo:
passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION', passthru = {v: self.get_file(v, rev).strip() for v in ['GITALY_SERVER_VERSION', 'GITLAB_PAGES_VERSION',
'GITLAB_SHELL_VERSION']} 'GITLAB_SHELL_VERSION']}
passthru["GITLAB_WORKHORSE_VERSION"] = version
return dict(version=self.rev2version(rev), return dict(version=self.rev2version(rev),
repo_hash=self.get_git_hash(rev), repo_hash=self.get_git_hash(rev),
owner=self.owner, owner=self.owner,
@ -186,7 +189,7 @@ def update_gitlab_shell():
def update_gitlab_workhorse(): def update_gitlab_workhorse():
"""Update gitlab-workhorse""" """Update gitlab-workhorse"""
data = _get_data_json() data = _get_data_json()
gitlab_workhorse_version = data['version'] gitlab_workhorse_version = data['passthru']['GITLAB_WORKHORSE_VERSION']
_call_nix_update('gitlab-workhorse', gitlab_workhorse_version) _call_nix_update('gitlab-workhorse', gitlab_workhorse_version)