gitlab: 17.2.9 -> 17.3.6 #350915
Merged
gitlab: 17.2.9 -> 17.3.6 #350915
Conversation
This file contains 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
|
Before #350901 since 17.3.x is a "stop release" that must be included in the upgrade cycle |
ofborg
bot
requested review from
krav,
xanderio,
talyz,
Conni2461,
dasJ,
blitz,
globin and
yayayayaka
|
gitaly really wants to have its git built with the Definitely WIP |
srhb
force-pushed
the
gitlab-17.3.6
branch
3 times, most recently
from
1ec182b
to
e049989
Compare
|
Well, this appears to work, but it's definitely not the intended way to use the bundled git. I'm unsure how much we would need to change to get it to function, however. It would be good to have some more eyes on this. (We're still using the |
gitaly now embeds git binaries in itself during the build https://gitlab.com/gitlab-org/gitaly/-/blob/10fd91391a7c30ca54ec81eea881740cfdee8b0a/packed_binaries.go#L22 These are meant to be built by the `Makefile` target `install-bundled-git` but this produces binaries with different names, and we're also referring to this version of git throughout the NixOS module, so we hack this by copying over the binaries from the deprecated `git` target with which we're building gitaly-git.
yayayayaka
added
1.severity: security
|
Successfully created backport PR for |
1 task
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.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.