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

gitlab: 12.4.1 -> 12.4.2 #72894

Merged
merged 3 commits into from Nov 8, 2019
Merged

gitlab: 12.4.1 -> 12.4.2 #72894

merged 3 commits into from Nov 8, 2019

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Nov 6, 2019

Motivation for this change
  • Update GitLab from 12.4.1 -> 12.4.2
  • Stop building GitLab components on macOS, since it, seemingly at random, fails to fetch the sources on Hydra. This can cause Linux builds to fail too, since the failure gets cached. Since we don't build the rails app for macOS, I don't see any reason why the rest should be built.
  • Lower the allowed memory usage when compiling webpack assets to give the i686 build on Hydra a chance of succeeding. Is there any way to test this before merging?
Things done
  • Tested basic functionality in local 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 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @flokli @fpletz @globin @krav @bgamari

@talyz
gitlab: Don't build any gitlab component outside linux
a30facc 
For some reason hydra seems to have issues downloading the
gitlab-workhorse source on macOS. Since we don't build the rails app
for macOS, the other components seem a bit useless there, so we
limit them to linux for now.
@talyz
gitlab: Limit node memory consumption to 2048MB
22302ce 
Hydra fails to build the assets on i686 - it runs out of memory. If we
limit the max consumption to 2048MB the assets still build, and will
hopefully also build on hydra.
@talyz
gitlab: 12.4.1 -> 12.4.2
a779d77
@talyz
Copy link
Contributor Author

talyz commented Nov 6, 2019

@GrahamcOfBorg test gitlab

@ofborg ofborg bot requested review from krav, globin and fpletz November 6, 2019 14:16
fpletz
fpletz approved these changes Nov 6, 2019
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Not tested this yet but the changes look fine. 👍

@fpletz fpletz requested a review from flokli November 6, 2019 15:34
@flokli
Copy link
Contributor

flokli commented Nov 8, 2019

It's possible to build a 32bit gitlab via pkgsi686Linux.gitlab - verified that locally.

@flokli
Copy link
Contributor

flokli commented Nov 8, 2019

pkgsi686Linux.gitaly still fails btw:

# github.com/libgit2/git2go
go/src/github.com/libgit2/git2go/diff.go:441:2: constant 2147483648 overflows DiffOptionsFlag

@flokli
Copy link
Contributor

flokli commented Nov 8, 2019

Still, this should be fine to be merged.

@flokli flokli merged commit a2429cf into NixOS:master Nov 8, 2019
@flokli
Copy link
Contributor

flokli commented Nov 8, 2019

backported to 19.09 in 84c3cf6, ce24a92, 23af404.

@talyz
Copy link
Contributor Author

talyz commented Nov 9, 2019

@flokli Ah, yeah, that seems to be due to this issue in git2go. Thanks for backporting!

@talyz talyz deleted the gitlab-12.4.2 branch June 16, 2021 07:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fpletz fpletz fpletz approved these changes

@krav krav Awaiting requested review from krav

@globin globin Awaiting requested review from globin

@flokli flokli Awaiting requested review from flokli

Assignees
No one assigned
Labels
8.has: clean-up 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@talyz @flokli @fpletz