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

Jump to bottom

[20.09] gitlab: 13.6.0 -> 13.6.1 #105697

Merged
merged 6 commits into from Dec 14, 2020
Merged

[20.09] gitlab: 13.6.0 -> 13.6.1 #105697

merged 6 commits into from Dec 14, 2020

Conversation

ghost
Copy link

@ghost ghost commented Dec 2, 2020

Motivation for this change
Things done
  • 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.

Milan Pässler added 6 commits December 2, 2020 14:56
gitaly: use buildGoModule
c76797b 
(cherry picked from commit 0f344cc)
gitlab-shell: use buildGoModule
32f021d 
(cherry picked from commit 2e4862d)
gitlab-workhorse: use buildGoModule
0016147 
(cherry picked from commit 844eddf)
gitlab: 13.6.0 -> 13.6.1
20feeb9 
(cherry picked from commit c1c2ff4)
gitaly: build with system libgit2
d0a4a0b 
(cherry picked from commit 72ba4fc)
nixos/gitlab: use bindsTo instead of requires for gitaly
fe2968c 
(cherry picked from commit 81aff9f)
@ofborg ofborg bot requested review from talyz, kalbasit, fpletz and globin December 2, 2020 14:08
@drewrisinger
Copy link
Contributor

Link to original PR b/c missing from above: #104689

drewrisinger
drewrisinger approved these changes Dec 3, 2020
View reviewed changes
Copy link
Contributor

@drewrisinger drewrisinger left a comment

Choose a reason for hiding this comment

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

  • Diff LGTM
  • Commits LGTM
  • Builds via nix-review:
https://github.com/NixOS/nixpkgs/pull/105697
5 packages built:
gitaly gitlab gitlab-ee gitlab-shell gitlab-workhorse

@bgamari
Copy link
Contributor

bgamari commented Dec 4, 2020

Was this tested? Perhaps I'm doing something wrong but Gitaly fails to start complaining about an unsupported git version locally.

@bgamari
Copy link
Contributor

bgamari commented Dec 4, 2020

However, cherry-picking 6f2e993 into the branch appears to fix this.

@ghost
Copy link
Author

ghost commented Dec 4, 2020

The issues you are seeing are not actually introduced by these commits. They were introduced with #104587, which was merged without proper testing.

#104896 is still making its way to nixos-20.09 via staging. That and this should fix it in theory, but I haven't tested it.

@srhb
Copy link
Contributor

srhb commented Dec 14, 2020

The git change is in 20.09 now, so presumably this should fix Gitlab in stable now,

@srhb srhb merged commit ec4b0d3 into NixOS:release-20.09 Dec 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@talyz talyz Awaiting requested review from talyz

@kalbasit kalbasit Awaiting requested review from kalbasit

@fpletz fpletz Awaiting requested review from fpletz

@globin globin Awaiting requested review from globin

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@drewrisinger @bgamari @srhb