[18.09] Gitlab 11.5.0 #51072
Merged
[18.09] Gitlab 11.5.0 #51072
+337
−271
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit 8e8f692)
(cherry picked from commit cb79c1e)
(cherry picked from commit d768e39)
we already set VERSION in makeFlags below. (cherry picked from commit 8b51e83)
(cherry picked from commit 3233efb)
(cherry picked from commit 625e66d)
(cherry picked from commit 293a631)
(cherry picked from commit a33622e)
(cherry picked from commit 63f2547)
… as it should The nixos test is a bit misleading, as the given nginx configuration would always cause gitlab to redirect to localhost, which is clearly not what you want in a production setup. Instead we now enable services.nginx.recommendedProxySettings, curl against http://gitlab, and assure we get redirected to that same hostname, too. (cherry picked from commit 6870eaf)
GrahamcOfBorg
added
6.topic: nixos
|
Success on x86_64-linux (full log) Attempted: gitaly, gitlab, gitlab-shell, gitlab-workhorse Partial log (click to expand)
|
|
Success on aarch64-linux (full log) Attempted: gitaly, gitlab, gitlab-shell, gitlab-workhorse Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: gitaly, gitlab-shell, gitlab-workhorse The following builds were skipped because they don't evaluate on x86_64-darwin: gitlab Partial log (click to expand)
|
(cherry picked from commit c3c57c7)
10 tasks
|
cc @srhb |
|
Success on x86_64-linux (full log) Attempted: gitaly, gitlab, gitlab-runner, gitlab-shell, gitlab-workhorse Partial log (click to expand)
|
|
Failure on x86_64-darwin (full log) Attempted: gitaly, gitlab-runner, gitlab-shell, gitlab-workhorse The following builds were skipped because they don't evaluate on x86_64-darwin: gitlab Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Attempted: gitaly, gitlab, gitlab-runner, gitlab-shell, gitlab-workhorse Partial log (click to expand)
|
|
I've no problem with this backport. The test succeeded (eventually...) for me, though I guess it might fail on Hydra with this speed. 😀 |
|
Yeah, 9p filesystem seems to be pretty slow, and ruby very IO-hungry (it reads a lot of small files during migrations). I'm not sure how this can be accelerated. I'm now taking a look into #49385 and also #49385 (comment), and will backport that into this PR as well |
(cherry picked from commit a3ec5dc)
8 tasks
|
Failure on x86_64-darwin (full log) Attempted: gitaly, gitlab-runner, gitlab-shell, gitlab-workhorse The following builds were skipped because they don't evaluate on x86_64-darwin: gitlab Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Attempted: gitaly, gitlab, gitlab-runner, gitlab-shell, gitlab-workhorse Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: gitaly, gitlab, gitlab-runner, gitlab-shell, gitlab-workhorse Partial log (click to expand)
|
|
@GrahamcOfBorg build gitlab-runner |
|
Success on x86_64-darwin (full log) Attempted: gitlab-runner Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Attempted: gitlab-runner Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: gitlab-runner Partial log (click to expand)
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
Backport of the GitLab updates from #50962 (excluding the
updater.pyscript, as we cherry-pick updates anyhow, and don't need updater tooling in that branch)Includes fix for CVE-2018-18643, released as 11.4.6.
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)nix path-info -Sbefore and after)