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

nextcloud28: 28.0.7 -> 28.0.8, nextcloud29: 29.0.3 -> 29.0.4 #328171

Merged
merged 5 commits into from
Jul 22, 2024

Conversation

dotlambda
Copy link
Member

Description of changes

https://nextcloud.com/changelog/#28-0-8
https://nextcloud.com/changelog/#29-0-4

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot requested review from bachp, Ma27, globin and schneefux July 18, 2024 13:48
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 18, 2024
@dotlambda dotlambda requested review from pyrox0 and onny July 18, 2024 16:31
@Ma27
Copy link
Member

Ma27 commented Jul 18, 2024

Won't be able to get to any reviews before this weekend, sorry.

Copy link
Member

@bachp bachp left a comment

Choose a reason for hiding this comment

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

29.0.4 working fine

Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

Change itself is OK.

There's one unresolved question though: what do we do with stable?
Due to recent (suspected) regressions in the app-update script, we'll need to decide what we do with stable (context: #326947 (comment))

  • do we accept nightly apps on stable (I'd disagree).
  • will the PR author create another PR for all supported stable versions of NixOS doing a manual app-update there? We can also resolve the conflicts once and get automatic backports back, but first we need to resolve the first part.

I don't want this to get buried behind a "cannot backport due to merge conflicts" message from GHA that everyone will ignore, hence "Requesting changes" until this is solved.

@dotlambda
Copy link
Member Author

There's one unresolved question though: what do we do with stable?

I don't see an issue with backporting all changes. We can exclude the change to the update script if you want.

@Ma27
Copy link
Member

Ma27 commented Jul 21, 2024

I don't see an issue with backporting all changes. We can exclude the change to the update script if you want.

Given my current knowledge of what's up I'd suggest to:

  • merge and backport only the nextcloud package updates (would you mind filing a follow-up PR for that?).
  • get the situation about the app-update resolved and backport all app-updates in a single PR.

Does that sound reasonable?

@dotlambda
Copy link
Member Author

  • merge and backport only the nextcloud package updates (would you mind filing a follow-up PR for that?).

Sure I can do that.

Copy link
Member

@Ma27 Ma27 left a comment

Choose a reason for hiding this comment

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

Thank you!

I think we're aligned on this now.

@Ma27 Ma27 merged commit 2df7266 into NixOS:master Jul 22, 2024
29 checks passed
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-328171-to-release-24.05 origin/release-24.05
cd .worktree/backport-328171-to-release-24.05
git switch --create backport-328171-to-release-24.05
git cherry-pick -x 0fde477b80d0686d821d728fe43a4a1b68d0438d 9568d1307a96c929284d68b3b5ac5cb8322a6d17 4613cf0d275b13adde2222ce9ec16f5effbd1a58 e1fe376294f95dbf6c3ed6a113974870645f59aa 2aa826256413477ec034a02a61c2a6c771964788

@dotlambda dotlambda deleted the nextcloud branch July 22, 2024 15:18
@dotlambda
Copy link
Member Author

I think we're aligned on this now.

I still think there's no harm in backporting the existing app updates because as of now there's no nightly version in there. But I don't particulary care about the stable branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants