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.

Sign up for GitHub

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

Jump to bottom

nixos/gitlab: Install and fixup vendorised gitlab-shell #58545

Merged
merged 1 commit into from Mar 29, 2019
Merged

nixos/gitlab: Install and fixup vendorised gitlab-shell #58545

merged 1 commit into from Mar 29, 2019

Conversation

bgamari
Copy link
Contributor

@bgamari bgamari commented Mar 29, 2019 •
edited

Motivation for this change

gitaly now ships its own vendorised version of gitlab-shell. Previously
we failed to install this, resulting in
https://gitlab.com/gitlab-org/gitlab-ce/issues/59403.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@bgamari
nixos/gitlab: Install and fixup vendorised gitlab-shell
50a4de7 
gitaly now ships its own vendorised version of gitlab-shell. Previously
we failed to install this, resulting in
https://gitlab.com/gitlab-org/gitlab-ce/issues/59403.
@flokli flokli merged commit ef047e7 into NixOS:master Mar 29, 2019
@flokli
Copy link
Contributor

flokli commented Mar 29, 2019

backported to 19.03 in 2f2cb4e and 18.09 in 399e3f3.

@jacobvosmaer
Copy link

(speaking as Gitaly maintainer) if you want to avoid problems like this in the future, perhaps consider removing ruby/spec and then copy everything else?

See for instance how omnibus-gitlab currently does it: https://gitlab.com/gitlab-org/omnibus-gitlab/blob/c29b0b3b920d352bddfccf1589983eaeedd9dfb6/config/software/gitaly.rb#L52

@bgamari
Copy link
Contributor Author

bgamari commented Apr 2, 2019

@jacobvosmaer, thank you for that hint. This is extremely helpful.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@bgamari @flokli @jacobvosmaer @GrahamcOfBorg