gitlab: 13.5.1 -> 13.6.0

Changed ruby version to 2.7.x to match upstream.
Added a gem config for gitlab-pg_query as it tries to download a source
tarball during the build process.
Also removed a patch for gitaly that has become obsolete by upstream fix
[here](https://gitlab.com/gitlab-org/gitaly/-/commit/de04077c25cc23b001317d2efdf5a9ead0bc86b9).
This commit is contained in:
Milan Pässler
2020-11-21 01:38:35 +01:00
parent 0f82bd767b
commit 2429d5a307
17 changed files with 505 additions and 471 deletions
@@ -1,8 +1,5 @@
source 'https://rubygems.org'
# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537
gem 'bundler', '>= 1.17.3'
gem 'rugged', '~> 0.28'
gem 'github-linguist', '~> 7.11', require: 'linguist'
gem 'gitlab-markup', '~> 1.7.1'
@@ -16,7 +13,7 @@ gem 'faraday', '~> 1.0'
gem 'rbtrace', require: false
# Labkit provides observability functionality
gem 'gitlab-labkit', '~> 0.12.0'
gem 'gitlab-labkit', '~> 0.13.2'
# Detects the open source license the repository includes
# This version needs to be in sync with GitLab CE/EE
@@ -33,10 +30,4 @@ group :development, :test do
gem 'pry', '~> 0.12.2', require: false
gem 'grpc-tools', '= 1.30.2'
# gitlab-shell spec gems
gem 'listen', '~> 0.5.0'
gem 'simplecov', '~> 0.17.1', require: false
gem 'vcr', '~> 4.0.0'
gem 'webmock', '~> 3.4.0'
end
@@ -24,9 +24,7 @@ GEM
adamantium (0.2.0)
ice_nine (~> 0.11.0)
memoizable (~> 0.4.0)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
ast (2.4.0)
ast (2.4.1)
binding_ninja (0.2.3)
builder (3.2.4)
charlock_holmes (0.7.7)
@@ -35,11 +33,8 @@ GEM
adamantium (~> 0.2.0)
equalizer (~> 0.0.9)
concurrent-ruby (1.1.7)
crack (0.4.3)
safe_yaml (~> 1.0.0)
crass (1.0.6)
diff-lcs (1.3)
docile (1.3.2)
equalizer (0.0.11)
erubi (1.9.0)
escape_utils (1.2.1)
@@ -67,11 +62,11 @@ GEM
gitlab-gollum-rugged_adapter (0.4.4.2)
mime-types (>= 1.15)
rugged (~> 0.25)
gitlab-labkit (0.12.0)
gitlab-labkit (0.13.2)
actionpack (>= 5.0.0, < 6.1.0)
activesupport (>= 5.0.0, < 6.1.0)
grpc (~> 1.19)
jaeger-client (~> 0.10)
jaeger-client (~> 1.1)
opentracing (~> 0.4)
redis (> 3.0.0, < 5.0.0)
gitlab-markup (1.7.1)
@@ -82,17 +77,15 @@ GEM
google-protobuf (~> 3.12)
googleapis-common-protos-types (~> 1.0)
grpc-tools (1.30.2)
hashdiff (0.3.9)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
jaeger-client (0.10.0)
jaeger-client (1.1.0)
opentracing (~> 0.3)
thrift
json (2.3.1)
licensee (8.9.2)
rugged (~> 0.24)
listen (0.5.3)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
@@ -114,8 +107,8 @@ GEM
opentracing (0.5.0)
optimist (3.0.1)
parallel (1.19.2)
parser (2.7.0.5)
ast (~> 2.4.0)
parser (2.7.2.0)
ast (~> 2.4.1)
proc_to_ast (0.1.0)
coderay
parser
@@ -124,7 +117,6 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (3.0.3)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
@@ -175,18 +167,12 @@ GEM
parser (>= 2.7.0.1)
ruby-progressbar (1.10.1)
rugged (0.28.4.1)
safe_yaml (1.0.5)
sanitize (4.6.6)
crass (~> 1.0.2)
nokogiri (>= 1.4.4)
nokogumbo (~> 1.4)
sentry-raven (3.0.4)
faraday (>= 1.0)
simplecov (0.17.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
stringex (2.8.5)
thread_safe (0.3.6)
thrift (0.11.0.0)
@@ -202,11 +188,6 @@ GEM
equalizer (~> 0.0.9)
parser (>= 2.6.5)
procto (~> 0.0.2)
vcr (4.0.0)
webmock (3.4.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
zeitwerk (2.4.0)
PLATFORMS
@@ -214,19 +195,17 @@ PLATFORMS
DEPENDENCIES
activesupport (~> 6.0.3.3)
bundler (>= 1.17.3)
factory_bot
faraday (~> 1.0)
github-linguist (~> 7.11)
gitlab-gollum-lib (~> 4.2.7.9)
gitlab-gollum-rugged_adapter (~> 0.4.4.2)
gitlab-labkit (~> 0.12.0)
gitlab-labkit (~> 0.13.2)
gitlab-markup (~> 1.7.1)
google-protobuf (~> 3.12)
grpc (~> 1.30.2)
grpc-tools (= 1.30.2)
licensee (~> 8.9.0)
listen (~> 0.5.0)
pry (~> 0.12.2)
rbtrace
rdoc (~> 6.0)
@@ -235,10 +214,7 @@ DEPENDENCIES
rubocop (~> 0.69)
rugged (~> 0.28)
sentry-raven (~> 3.0)
simplecov (~> 0.17.1)
timecop
vcr (~> 4.0.0)
webmock (~> 3.4.0)
BUNDLED WITH
2.1.4
@@ -19,22 +19,16 @@ let
};
};
in buildGoPackage rec {
version = "13.5.1";
version = "13.6.0";
pname = "gitaly";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "1vkifmp56lkgj178na7pqd5h9yxffcy78yaz7ykd4rmgi4c8ayk8";
sha256 = "1b3vjg5sxrg8cfxn1nh8j26h847kxrfnn2chbb5v3ivhp1kp6zh2";
};
# Fix a check which assumes that hook files are writeable by their
# owner.
patches = [
./fix-executable-check.patch
];
goPackagePath = "gitlab.com/gitlab-org/gitaly";
passthru = {
@@ -48,7 +42,7 @@ in buildGoPackage rec {
postInstall = ''
mkdir -p $ruby
cp -rv $src/ruby/{bin,lib,proto,git-hooks,gitlab-shell} $ruby
cp -rv $src/ruby/{bin,lib,proto,git-hooks} $ruby
'';
outputs = [ "out" "ruby" ];
+43 -16
View File
@@ -428,8 +428,8 @@
fetch = {
type = "git";
url = "https://github.com/getsentry/raven-go";
rev = "v0.1.2";
sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
rev = "v0.2.0";
sha256 = "0imfwmsb72168fqandf2lxhzhngf2flxhzaar8hcnnfjv2a291lf";
};
}
{
@@ -437,8 +437,8 @@
fetch = {
type = "git";
url = "https://github.com/getsentry/sentry-go";
rev = "v0.5.1";
sha256 = "1kfn0gcb4c6amhagv04ydpl6p9cqw7f0lxas688a0rf89iwdzz89";
rev = "v0.7.0";
sha256 = "13n9r7845wsq9z61rbvlqjjjg4aifplc74v3kv0i1lys2fw8a5k9";
};
}
{
@@ -1395,6 +1395,15 @@
sha256 = "11zbhg4kds5idsya04bwz4plj0mmiigypzppzih731ppbk2ms1zg";
};
}
{
goPackagePath = "github.com/oklog/ulid";
fetch = {
type = "git";
url = "https://github.com/oklog/ulid";
rev = "v2.0.2";
sha256 = "1apm4r23kxsm0c9hlxsr7xh6xwrk2cjqylbpxd4ffxbl6bwflja0";
};
}
{
goPackagePath = "github.com/olekukonko/tablewriter";
fetch = {
@@ -1436,8 +1445,8 @@
fetch = {
type = "git";
url = "https://github.com/opentracing/opentracing-go";
rev = "v1.0.2";
sha256 = "0i0ghg94dg8lk05mw5n23983wq04yjvkjmdkc9z5y1f3508938h9";
rev = "v1.2.0";
sha256 = "04rgdwl29kimp2wnm4dycnzp7941hvpj6wym85x23c6fclacm94h";
};
}
{
@@ -1467,6 +1476,15 @@
sha256 = "0kfc95jc2hfgwzcpdfa5hrxgj7s6rzx5jc0n1sn863bsngx2q1ca";
};
}
{
goPackagePath = "github.com/pborman/getopt";
fetch = {
type = "git";
url = "https://github.com/pborman/getopt";
rev = "7148bc3a4c30";
sha256 = "0zhvvmv671r1fbdd5hbv3flx8k2rb60giqx115w0553c56qkqfpj";
};
}
{
goPackagePath = "github.com/pelletier/go-toml";
fetch = {
@@ -1634,8 +1652,8 @@
fetch = {
type = "git";
url = "https://github.com/sirupsen/logrus";
rev = "v1.6.0";
sha256 = "1zf9is1yxxnna0d1pyag2m9ziy3l27zb2j92p9msm1gx5jjrvzzj";
rev = "v1.7.0";
sha256 = "1a59pw7zimvm8k423iq9l4f4qjj1ia1xc6pkmhwl2mxc46y2n442";
};
}
{
@@ -1733,8 +1751,8 @@
fetch = {
type = "git";
url = "https://github.com/stretchr/testify";
rev = "v1.5.1";
sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl";
rev = "v1.6.1";
sha256 = "1yhiqqzjvi63pf01rgzx68gqkkvjx03fvl5wk30br5l6s81s090l";
};
}
{
@@ -1913,8 +1931,8 @@
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
rev = "1a2bfecd2f0e";
sha256 = "197b3yn7lp6dbzcgxrj3ns2a839adcfmcwi3h53i1sr6952ciayx";
rev = "3f9890ef73dc";
sha256 = "1zx7x3g18xzw7fs7cayd20llxabv5r93m2mp6ixgr99ksvi6zix7";
};
}
{
@@ -1922,8 +1940,8 @@
fetch = {
type = "git";
url = "https://gitlab.com/gitlab-org/labkit.git";
rev = "45895e129029";
sha256 = "17adv1gcdg0jiy8i5lr064pm3p9ywq6s0iwh9w4q5pycp4qkmn48";
rev = "40dcf811328c";
sha256 = "1x22iz53wjg1qps0bnr4lniik09szmy99ny2kb6smjpv9cr6klw7";
};
}
{
@@ -2030,8 +2048,8 @@
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
rev = "af09f7315aff";
sha256 = "0kr94lzr8ngrc6913j5xh6g4r7g087dbdgnpzi6rjcl0bf8nsr22";
rev = "e3ed0017c211";
sha256 = "0nz91nxgfcbcxirscdrxcq5a97z5pyz0g0k2chjxx228dz59aw1i";
};
}
{
@@ -2250,6 +2268,15 @@
sha256 = "1md0hlyd9s6myv3663i9l59y74n4xjazifmmyxn43g86fgkc5lzj";
};
}
{
goPackagePath = "gopkg.in/yaml.v3";
fetch = {
type = "git";
url = "https://gopkg.in/yaml.v3";
rev = "9f266ea9e77c";
sha256 = "1bbai3lzb50m0x2vwsdbagrbhvfylj9k1m32hgbqwldqx4p9ay35";
};
}
{
goPackagePath = "honnef.co/go/tools";
fetch = {
@@ -1,13 +0,0 @@
diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go
index 993e095d..f9bbb943 100644
--- a/internal/gitaly/config/config.go
+++ b/internal/gitaly/config/config.go
@@ -217,7 +217,7 @@ func checkExecutable(path string) error {
return err
}
- if fi.Mode()&0755 < 0755 {
+ if fi.Mode()&0555 < 0555 {
return fmt.Errorf("not executable: %v", path)
}
@@ -49,24 +49,15 @@
};
version = "0.2.0";
};
addressable = {
dependencies = ["public_suffix"];
ast = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bcm2hchn897xjhqj9zzsxf3n9xhddymj4lsclz508f4vw3av46l";
sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
type = "gem";
};
version = "2.6.0";
};
ast = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7";
type = "gem";
};
version = "2.4.0";
version = "2.4.1";
};
binding_ninja = {
groups = ["default" "development" "test"];
@@ -125,15 +116,6 @@
};
version = "1.1.7";
};
crack = {
dependencies = ["safe_yaml"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
type = "gem";
};
version = "0.4.3";
};
crass = {
groups = ["default"];
platforms = [];
@@ -152,16 +134,6 @@
};
version = "1.3";
};
docile = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif";
type = "gem";
};
version = "1.3.2";
};
equalizer = {
source = {
remotes = ["https://rubygems.org"];
@@ -276,10 +248,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0a63zgjll83b25hiq8m4sk75jci2rj8z46lss0j3bc6zi3pxnzax";
sha256 = "0vgd61xdclihifcdivddfs1gipxy1ql0kf9q47k9h0xisscyjhd2";
type = "gem";
};
version = "0.12.0";
version = "0.13.2";
};
gitlab-markup = {
groups = ["default"];
@@ -333,16 +305,6 @@
};
version = "1.30.2";
};
hashdiff = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1qji49afni3c90zws617x514xi7ik70g2iwngj9skq68mjcq6y4x";
type = "gem";
};
version = "0.3.9";
};
i18n = {
dependencies = ["concurrent-ruby"];
groups = ["default" "development" "test"];
@@ -368,10 +330,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "198m72c9w3wfwr1mq22dcjjm7d4jd0bci4lrq6zq2zvlzhi04n8l";
sha256 = "1a2qlkc1hkr5hkj2574l1a63sm04bdx98gfhh9m8vvp6psdrnpnb";
type = "gem";
};
version = "0.10.0";
version = "1.1.0";
};
json = {
groups = ["default" "development" "test"];
@@ -392,14 +354,6 @@
};
version = "8.9.2";
};
listen = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0inlw7vix61170vjr87h9izhjm5dbby8rbfrf1iryiv7b3kyvkxl";
type = "gem";
};
version = "0.5.3";
};
loofah = {
dependencies = ["crass" "nokogiri"];
groups = ["default"];
@@ -553,10 +507,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0iirjc36irgwpfb58jdf9gli382cj893y9caqhxas8anpzzlikgc";
sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
type = "gem";
};
version = "2.7.0.5";
version = "2.7.2.0";
};
proc_to_ast = {
dependencies = ["coderay" "parser" "unparser"];
@@ -584,14 +538,6 @@
};
version = "0.12.2";
};
public_suffix = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "08q64b5br692dd3v0a9wq9q5dvycc6kmiqmjbdxkxbfizggsvx6l";
type = "gem";
};
version = "3.0.3";
};
rack = {
groups = ["default"];
platforms = [];
@@ -811,16 +757,6 @@
};
version = "0.28.4.1";
};
safe_yaml = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j7qv63p0vqcd838i2iy2f76c3dgwzkiz1d1xkg7n0pbnxj2vb56";
type = "gem";
};
version = "1.0.5";
};
sanitize = {
dependencies = ["crass" "nokogiri" "nokogumbo"];
source = {
@@ -841,27 +777,6 @@
};
version = "3.0.4";
};
simplecov = {
dependencies = ["docile" "json" "simplecov-html"];
groups = ["development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw";
type = "gem";
};
version = "0.17.1";
};
simplecov-html = {
groups = ["default" "development" "test"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn";
type = "gem";
};
version = "0.10.2";
};
stringex = {
groups = ["default"];
platforms = [];
@@ -930,23 +845,6 @@
};
version = "0.4.7";
};
vcr = {
source = {
remotes = ["https://rubygems.org"];
sha256 = "0qh7lkj9b0shph84dw1wsrlaprl0jn1i4339fpsfy99402290zrr";
type = "gem";
};
version = "4.0.0";
};
webmock = {
dependencies = ["addressable" "crack" "hashdiff"];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03994dxs4xayvkxqp01dd1ivhg4xxx7z35f7cxw7y2mwj3xn24ib";
type = "gem";
};
version = "3.4.2";
};
zeitwerk = {
groups = ["default" "development" "test"];
platforms = [];