Skip to content

gitlab: 13.0.6-ee -> 13.1.2-ee#92057

Closed
flokli wants to merge 1 commit intoNixOS:masterfrom
flokli:gitlab-13.1.2-ee
Closed

gitlab: 13.0.6-ee -> 13.1.2-ee#92057
flokli wants to merge 1 commit intoNixOS:masterfrom
flokli:gitlab-13.1.2-ee

Conversation

@flokli
Copy link
Member

@flokli flokli commented Jul 2, 2020

Motivation for this change

https://about.gitlab.com/releases/2020/07/01/security-release-13-1-2-release

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.

@flokli flokli requested review from a user, globin and talyz July 2, 2020 15:27
@ofborg ofborg bot requested a review from fpletz July 2, 2020 15:40
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jul 2, 2020
@flokli
Copy link
Member Author

flokli commented Jul 2, 2020

This currently fails with gitlab-shell:

# gitlab.com/gitlab-org/gitlab-shell/internal/handler
go/src/gitlab.com/gitlab-org/gitlab-shell/internal/handler/exec.go:94:55: cannot use grpccorrelation.StreamClientCorrelationInterceptor(grpccorrelation.WithClientName(executable.GitlabShell)) (type "gitlab.com/gitlab-org/labkit/vendor/google.golang.org/grpc".StreamClientInterceptor) as type "google.golang.org/grpc".StreamClientInterceptor in argument to "google.golang.org/grpc".WithStreamInterceptor
go/src/gitlab.com/gitlab-org/gitlab-shell/internal/handler/exec.go:99:54: cannot use grpccorrelation.UnaryClientCorrelationInterceptor(grpccorrelation.WithClientName(executable.GitlabShell)) (type "gitlab.com/gitlab-org/labkit/vendor/google.golang.org/grpc".UnaryClientInterceptor) as type "google.golang.org/grpc".UnaryClientInterceptor in argument to "google.golang.org/grpc".WithUnaryInterceptor
builder for '/nix/store/jra41xhmc53y68n9l6ir44zzwi0b8mdv-gitlab-shell-13.3.0.drv' failed with exit code 1
error: build of '/nix/store/jra41xhmc53y68n9l6ir44zzwi0b8mdv-gitlab-shell-13.3.0.drv' failed

@flokli flokli mentioned this pull request Jul 2, 2020
Merged
10 tasks
@flokli
Copy link
Member Author

flokli commented Jul 6, 2020

Closing this PR, as I won't be able to do this upgrade any time soon.

The security fix in #92060 should be sufficient, but getting to >=13.1.x needs to be tackled eventually…

@flokli flokli closed this Jul 6, 2020
@ghost
Copy link

ghost commented Jul 6, 2020

Thanks for your efforts, I will test the security fix later today and merge if everything is okay.

@flokli flokli deleted the gitlab-13.1.2-ee branch September 27, 2020 14:36
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

@globin globin Awaiting requested review from globin

@fpletz fpletz Awaiting requested review from fpletz

Assignees

No one assigned

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@flokli