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

Merge pull request #86420 from flokli/gitlab-12.8.10 

gitlab: 12.8.9 -> 12.8.10
This commit is contained in:
Kim Lindberger 2020-05-01 13:12:02 +02:00 committed by GitHub
parent 4e14ff6eac fc64bca95b
commit 998ac52f0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
{ {
"version": "12.8.9", "version": "12.8.10",
"repo_hash": "07vayjy3020hapbdx2wiv91g9xrfmvngbyj05hs2p0p3gwj6g2a4", "repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15",
"owner": "gitlab-org", "owner": "gitlab-org",
"repo": "gitlab", "repo": "gitlab",
"rev": "v12.8.9-ee", "rev": "v12.8.10-ee",
"passthru": { "passthru": {
"GITALY_SERVER_VERSION": "12.8.9", "GITALY_SERVER_VERSION": "12.8.10",
"GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_PAGES_VERSION": "1.16.0",
"GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_SHELL_VERSION": "11.0.0",
"GITLAB_WORKHORSE_VERSION": "8.21.2" "GITLAB_WORKHORSE_VERSION": "8.21.2"

4
pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock
View File

@ -114,7 +114,7 @@ GEM
minitest (5.14.0) minitest (5.14.0)
msgpack (1.3.1) msgpack (1.3.1)
multipart-post (2.0.0) multipart-post (2.0.0)
nokogiri (1.10.7) nokogiri (1.10.9)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
nokogumbo (1.5.0) nokogumbo (1.5.0)
nokogiri nokogiri
@ -242,4 +242,4 @@ DEPENDENCIES
webmock (~> 3.4.0) webmock (~> 3.4.0)
BUNDLED WITH BUNDLED WITH
1.17.3 2.1.4

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@ -28,14 +28,14 @@ let
}; };
}); });
in buildGoPackage rec { in buildGoPackage rec {
version = "12.8.9"; version = "12.8.10";
pname = "gitaly"; pname = "gitaly";
src = fetchFromGitLab { src = fetchFromGitLab {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitaly"; repo = "gitaly";
rev = "v${version}"; rev = "v${version}";
sha256 = "06q1km2pigpl4yxl8pkzdy2yxzvsfm6n5r3kmd8h19j3sc6imbmh"; sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs";
}; };
# Fix a check which assumes that hook files are writeable by their # Fix a check which assumes that hook files are writeable by their

4
pkgs/applications/version-management/gitlab/gitaly/gemset.nix
View File

@ -515,10 +515,10 @@
platforms = []; platforms = [];
source = { source = {
remotes = ["https://rubygems.org"]; remotes = ["https://rubygems.org"];
sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm";
type = "gem"; type = "gem";
}; };
version = "1.10.7"; version = "1.10.9";
}; };
nokogumbo = { nokogumbo = {
dependencies = ["nokogiri"]; dependencies = ["nokogiri"];

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

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#! 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 #! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix
import click import click
import click_log import click_log
@ -13,7 +13,6 @@ from distutils.version import LooseVersion
from typing import Iterable from typing import Iterable
import requests import requests
from xml.etree import ElementTree
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -30,12 +29,11 @@ class GitLabRepo:
@property @property
def tags(self) -> Iterable[str]: def tags(self) -> Iterable[str]:
r = requests.get(self.url + "/tags?format=atom", stream=True) r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json()
tags = r.get("Tags", [])
tree = ElementTree.fromstring(r.content)
versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')]
# filter out versions not matching version_regex # filter out versions not matching version_regex
versions = list(filter(self.version_regex.match, versions)) versions = list(filter(self.version_regex.match, tags))
# sort, but ignore v and -ee for sorting comparisons # sort, but ignore v and -ee for sorting comparisons
versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True)