New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[19.03] gitlab updates #66622
[19.03] gitlab updates #66622
Conversation
7a1ffad
to
85ae5b7
Compare
@GrahamcOfBorg test gitlab |
b4278f1
to
b4103da
Compare
For some reason,
Interestingly, this works just fine on unstable (with pretty much the same codebase in |
gitlab:shell:create_hooks has been removed upstream, I'm pretty sure i removed this on master, will try to get to test this on our instance tomorrow. But don't necessarily block merging on this, looks fine generally. |
I'd rather not break the gitlab vm tests on 19.03. will have a look later today, thanks for the pointer!
|
5d0dcb3
to
3cdea22
Compare
This is WIP to get rid of PermissionsStartOnly=true (cherry picked from commit 783c2f6)
(cherry picked from commit 52fd300)
This adds a configuration option allowing the addition of additional initializers in config/extra-gitlab.rb. (cherry picked from commit f2bdc91)
Corresponding runner for GitLab version 12.1.0 Changelog: https://gitlab.com/gitlab-org/gitlab-runner/blob/12-1-stable/CHANGELOG.md (cherry picked from commit bc6366b)
(cherry picked from commit 8761bc0)
This is a major version bump but things were generally straightforward save two wrinkles: * it is necessary to ignore collisions in the gitlab bundler environment as both `omniauth_oauth2_generic` and `apollo_upload_server` provide a `console` executable. * grpc had to be patched since its build system expects the `AR` environment variable to contain not just the path to `ar` but also the `rpc` flags (see the discussion in nixpkgs NixOS#63056). (cherry picked from commit 363b352)
(cherry picked from commit 9f77b4a)
(cherry picked from commit 722ee77)
(cherry picked from commit 5589612)
(cherry picked from commit 7efcbea)
(cherry picked from commit 2ee14c3)
(cherry picked from commit 8ce1c4c)
(cherry picked from commit 362076c)
There's no reason to ship a 1.6GiB .tar file in the output. Slims down that output from 1.9GiB to ~350MiB (cherry picked from commit 765491c)
(cherry picked from commit 6c98b0f)
It seems the sha256 hashes of 3 gitaly dependencies were wrong or changed. (cherry picked from commit 89aae90)
(cherry picked from commit 48da993)
gitaly's git2go build with libgit2 0.26.6 due to missing C.GIT_DIFF_INDENT_HEURISTIC. nixpkgs unstable already defaults to 0.27, so it's not a problem there.
(cherry picked from commit a33ddd7)
(cherry picked from commit 42170cb)
These can be directories. (cherry picked from commit d7d873b)
So this won't be cleaned up by removing config/* (cherry picked from commit 3469c20)
3cdea22
to
175269c
Compare
@GrahamcOfBorg test gitlab |
@globin did you get a chance to give this a test run on your instance? |
@flokli just tested with our instance, lgtm! |
Thanks! |
Motivation for this change
#66621
had to cherry-pick some changes from unstable as well.
Things done
sandbox
innix.conf
on non-NixOS)nix-shell -p nix-review --run "nix-review wip"
./result/bin/
)nix path-info -S
before and after)Notify maintainers
cc @lheckemann @talyz @bgamari