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

gitlab: 12.7.6 -> 12.8.1 #81556

Merged
7 commits merged into from Mar 3, 2020
Merged

gitlab: 12.7.6 -> 12.8.1 #81556

7 commits merged into from Mar 3, 2020

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Mar 2, 2020

Motivation for this change

Update GitLab to the latest version.

https://about.gitlab.com/releases/2020/02/22/gitlab-12-8-released/
https://about.gitlab.com/releases/2020/02/24/gitlab-12-8-1-released/

This is basically #81057 with fixes and minor additions. I can't add anything to that PR, so I opened this instead.

This still suffers from #79374.

Things done
  • Tested a few things locally in a VM
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@talyz
Copy link
Contributor Author

talyz commented Mar 2, 2020

@GrahamcOfBorg test gitlab

@ghost
Copy link

ghost commented Mar 3, 2020

Interestingly this fixes #81636, so it would make #81506 unnecessary.

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deployed this on a NixOS machine without any problems 👍

In order to build gitaly, this locally overrides the version of
libgit2, since gitaly is not compatible with the latest version.
This is left over from when gitlab-shell had a ruby part and a go
part. The ruby part is now gone, so let's call the go part
gitlab-shell.
The way ruby loads gems and keeps track of their paths seems to not
always work very well when the gems are accessed through
symlinks. Ruby will then complain that the same files are loaded
multiple times; it relies on the file's full path to determine whether
the file is loaded or not.

This adds an option to simply copy all gem files into the environment
instead, which gets rid of this issue, but may instead result in major
file duplication.
This fixes issue NixOS#79374, where gitaly prints warning messages on the
client side when running push or fetch.
@talyz
Copy link
Contributor Author

talyz commented Mar 3, 2020

I just added a fix for #79374. It touches the bundlerEnv code, but shouldn't affect any other packages than gitaly atm.

@GrahamcOfBorg test gitlab

@ghost
Copy link

ghost commented Mar 3, 2020

I deployed the new version and can confirm it fixes #79374 too. Thanks!

@ghost
Copy link

ghost commented Mar 3, 2020

I also ran nix-review to make sure the changes do bundlerEnv do not create problems for other ruby applications.

This was referenced Mar 3, 2020
@talyz talyz deleted the gitlab-12.8.1 branch June 16, 2021 08:02
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants