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.3.5 -> 12.4.0 + module fixes #72088

Merged
merged 3 commits into from
Oct 28, 2019
Merged

gitlab: 12.3.5 -> 12.4.0 + module fixes #72088

merged 3 commits into from
Oct 28, 2019
+1,224 −1,730

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Oct 27, 2019 •
edited
Loading

Summary
  • Update GitLab to 12.4.0
  • Fix version number reports - gitlab-shell and gitlab-workhorse previously reported unknown
  • Abort on errors in initialization scripts - we don't want to continue boot unless the state is properly initialized
  • Remove the old lib symlink in the state directory
Things done

Tested by running in a VM. Specific features tested:

  • Adding a new repo
  • Removing and adding SSH keys
  • Pulling and pushing repos
  • 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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @globin @fpletz @flokli

Sorry, something went wrong.

talyz added 3 commits October 27, 2019 13:35
@talyz
gitlab: 12.3.5 -> 12.4.0

Verified

This commit was signed with the committer’s verified signature.
shuding Shu Ding
GPG key ID: 899520937F032E83
Verified
Learn about vigilant mode
c431130 
- gitlab-shell no longer requires ruby for anything else than the
  install script, so the bundlerEnv stuff could be dropped

- gitlab-shell and gitlab-workhorse now report their versions
  correctly
@talyz
nixos/gitlab: Abort on error and use of unset variables

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
8e806aa 
Default behavior is to continue executing the script even when one or
multiple steps fail. We want to abort early if any part of the
initialization fails to not run with a partially initialized state.

Default behavior also allows dereferencing non-existent variables,
potentially resulting in hard-to-find bugs.
@talyz
nixos/gitlab: Remove the old lib symlink in the state directory

Verified

This commit was signed with the committer’s verified signature.
shuding Shu Ding
GPG key ID: 899520937F032E83
Verified
Learn about vigilant mode
e65117a 
Also, remove the old and unused PermissionsStartOnly definition in the
gitlab-workhorse systemd service.
@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 27, 2019
@ofborg ofborg bot requested review from ehmry, fpletz and globin October 27, 2019 14:26
ehmry
ehmry reviewed Oct 28, 2019
View reviewed changes
pkgs/applications/version-management/gitlab/gitlab-shell/deps.nix
@@ -68,10 +113,37 @@
fetch = {
type = "git";
url = "https://github.com/getsentry/raven-go";
rev = "v0.1.0";
rev = "v0.1.2";
sha256 = "1dl80kar4lzdcfl3w6jssi1ld6bv0rmx6sp6bz6rzysfr9ilm02z";
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't look right, sha256 should have been updated as well.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Indeed, that's weird. I guess it worked for me since the old package was already in my store. I know I ran nix-collect-garbage, but I might have had a result lying around somewhere...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ah, nope, this is correct: https://github.com/getsentry/raven-go/releases

No idea why it's tagged like that, but it is 😕

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, thanks for checking.

@ehmry
Copy link
Contributor

ehmry commented Oct 28, 2019

@GrahamcOfBorg build gitlab

@ehmry ehmry merged commit d5db11c into NixOS:master Oct 28, 2019
@talyz
Copy link
Contributor Author

talyz commented Oct 28, 2019

This update breaks the images on the welcome screen - this is apparently a known GitLab issue that is fixed in master, but not yet released. It's nothing disastrous, but looks a bit broken; sounds like they're going to release a patch pretty soon, though, so I'll wait for that before porting this to 19.09.

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

@ehmry ehmry

@fpletz fpletz

@globin globin

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 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
2 participants
@talyz @ehmry