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

gitlab: 12.5.5 -> 12.6.2 #76193

Merged
merged 7 commits into from Jan 3, 2020
Merged

gitlab: 12.5.5 -> 12.6.2 #76193

merged 7 commits into from Jan 3, 2020

Conversation

talyz
Copy link
Contributor

@talyz talyz commented Dec 23, 2019 •
edited

Motivation for this change

Update GitLab to the latest version.

Gitaly is problematic in this release for two reasons:

  1. The version used in the gitlab repo is not tagged and as a result its commit id is used instead (reported here)
  2. A new permission check on hook files checks for write permission when only read and execute are needed (reported here)
Things done

Tried a few things manually in a VM:

  • Clone, commit and push to a repo
  • Remove and add ssh keys, making sure the executable path referenced in authorized_keys is correct
  • 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.
Notify maintainers

cc @flokli @globin @roblabla @fpletz @krav @petabyteboy

@talyz
gitlab-shell: 10.2.0 -> 10.3.0
6972aec
@talyz
gitlab-workhorse: 8.14.1 -> 8.18.0
2f61471
@talyz
gitaly: 1.72.1 -> a4b6c71d4b7c1588587345e2dfe0c6bd7cc63a83
445bc14 
For some reason this untagged commit is the one referred to in the
main repository; this might be a mistake, but we'll have to package it
for now to follow upstream.
@talyz
gitlab: update.py: Get go deps for gitlab-shell from the root dir
a3c72e6 
GitLab Shell now has the go.mod and go.sum files in the root of the
repo; the go subdirectory has been removed and all the code in it has
been moved up to the root.
@talyz
gitlab: 12.5.5 -> 12.6.0
ff28cfa
@talyz
Copy link
Contributor Author

talyz commented Dec 23, 2019

@GrahamcOfBorg test gitlab

@ofborg ofborg bot requested review from ehmry, globin, fpletz and krav December 23, 2019 00:17
@talyz talyz changed the title gitlab: 12.5.5 -> 12.6.0 gitlab: 12.5.5 -> 12.6.1 Dec 28, 2019
@talyz
Copy link
Contributor Author

talyz commented Dec 28, 2019

Updated to latest security update.

@GrahamcOfBorg test gitlab

@flokli
Copy link
Contributor

flokli commented Jan 2, 2020

Updated to the latest security update.

@talyz talyz changed the title gitlab: 12.5.5 -> 12.6.1 gitlab: 12.5.5 -> 12.6.2 Jan 3, 2020
@talyz
Copy link
Contributor Author

talyz commented Jan 3, 2020

The issues are reported; I've updated the description with links.

@flokli flokli merged commit cd9cbb1 into NixOS:master Jan 3, 2020
@flokli
Copy link
Contributor

flokli commented Jan 3, 2020

Merged - especially considering the security fixes, let's not delay this any further.

@flokli
Copy link
Contributor

flokli commented Jan 3, 2020

backported to 19.09 in dbc7909, 9fc0570, 18469ac, 7ce433c, c93501d, fd7ce83, 7201d23.

@talyz talyz deleted the gitlab-12.6.0 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

@ehmry ehmry Awaiting requested review from ehmry

@globin globin Awaiting requested review from globin

@fpletz fpletz Awaiting requested review from fpletz

@krav krav Awaiting requested review from krav

Assignees
No one assigned
Labels
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
2 participants
@talyz @flokli