-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
Conversation
The script can now be executed from an arbitrary location and doesn't require Nix's experimental features to be enabled.
Won't be able to get to any reviews before this weekend, sorry. |
There was a problem hiding this 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
There was a problem hiding this 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.
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:
Does that sound reasonable? |
Sure I can do that. |
There was a problem hiding this 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.
Backport failed for 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 |
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. |
Description of changes
https://nextcloud.com/changelog/#28-0-8
https://nextcloud.com/changelog/#29-0-4
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.