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

nextcloud: 18.0.4 -> 18.0.6 [20.03] #90269

Merged
merged 1 commit into from Jun 18, 2020

Conversation

tokudan
Copy link
Contributor

@tokudan tokudan commented Jun 14, 2020

Motivation for this change

backport of #90268 for 20.03
runs on my system

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.

(cherry picked from commit 660973d)
@tokudan
Copy link
Contributor Author

tokudan commented Jun 14, 2020

@GrahamcOfBorg test nextcloud.with-postgresql-and-redis nextcloud.with-mysql-and-memcached nextcloud.basic

@bjornfor
Copy link
Contributor

Cherry picking commits should be done from the master branch. Or else we get dangling commit refs.

@Mic92 Mic92 merged commit 07e2936 into NixOS:release-20.03 Jun 18, 2020
@Mic92
Copy link
Member

Mic92 commented Jun 18, 2020

commit in the commit message looks correct to me.

@bjornfor
Copy link
Contributor

Ah, the commit became part of master since the other PR was merged as is (and without rebase). It seems safer to me to start with a master commit than to assume the commit will be part of master in the future.

@Mic92
Copy link
Member

Mic92 commented Jun 19, 2020

I think as a merger its always safe, when one knows they also merged the other PR before instead of using rebase/squash.

@tokudan
Copy link
Contributor Author

tokudan commented Jun 19, 2020

@bjornfor Having to wait for the merge of the other commit into master before starting this PR would have been a waste of time.
This way I could open two PRs to fix both branches within 5 minutes and I had no further action after starting the process.
Having to wait for the first PR would have meant that right now I'd be opening the 2nd PR and would probably have to wait another week to get this one merged, effectively doubling the turnaround time and being a bigger hassle for reviewers and mergers that need to act twice instead of just getting two notifications for the same time.

@Mic92
Copy link
Member

Mic92 commented Jun 21, 2020

It only ever gets a problem if you would change your master PR after creating the backport.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants