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
[20.09] gitlab: 13.0.14 -> 13.6.0 #104587
Conversation
13.4.3 (cherry-picked from commit c16a977)
(cherry-picked from commit f98a632)
(cherry-picked from commit 2cf524c)
(cherry-picked from commit 4555a26)
(cherry-picked from commit 0f82bd7)
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). (cherry-picked from commit 2429d5a)
(cherry-picked from commit d6e0d38)
Does this actually work?
|
I didn't do much testing other than running the NixOS test, so it's definitely possible. Sorry about that. |
I guess the test doesn't cover gitaly properly then, which is quite unfortunate. A different git attribute may be necessary, yes, since I imagine that's a bit of a jump for a stable branch. |
In addition to running into the gitaly issue requiring git >= 2.29, I also ran into another issue when upgrading nixos 20.09. If your system.stateVersion is < 20.03, then your gitlab install may be using postgres_9_6 (even if, like me, you had never explicitly enabled postgresql or chosen any specific version). Gitlab 13.0.x works with postgres 9, but 13.6.x seems to require at least postgresql 11. Thus, after upgrading, gitlab 13.6 fails to run one of its version upgrade scripts and fails to start. The only remedy is to upgrade postgres from 9 to >= 11 using the upgrade instructions here: https://nixos.org/manual/nixos/stable/index.html#module-services-postgres-upgrading and then manually set Ideally nothing like this would ever be required when upgrading within a stable channel, but if that's not possible, at least an assert that the postgresql version is >= 11 in the nixos module would have saved me from an unpleasant surprise. |
Just also FYI for the gitaly issue for anybody who's not already familiar with nixpkgs overlays, adding this to your nixos configuration will fix gitlab until #104896 is merged:
|
Motivation for this change
Backport of #99116
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)