Skip to content
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

[Backport release-24.05] gitlab: 17.2.9 -> 17.3.6 #351854

Merged
merged 2 commits into from
Oct 31, 2024

Conversation

github-actions[bot]
Copy link
Contributor

Bot-based backport to release-24.05, triggered by a label in #350915.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

(cherry picked from commit 77804e9)
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.

(cherry picked from commit b5315bf)
@github-actions github-actions bot added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Oct 28, 2024
@github-actions github-actions bot mentioned this pull request Oct 28, 2024
13 tasks
@srhb srhb merged commit 9091130 into release-24.05 Oct 31, 2024
19 of 20 checks passed
@yayayayaka yayayayaka deleted the backport-350915-to-release-24.05 branch October 31, 2024 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant