Skip to content

discourse: 3.3.2 -> 3.4.2 #394129

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.

Sign up for GitHub

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
Merged
mweinelt merged 3 commits into from
Apr 21, 2025
Merged

discourse: 3.3.2 -> 3.4.2 #394129

mweinelt merged 3 commits into from
Apr 21, 2025
+817 −708

Conversation

@leona-ya
Copy link
Member

@leona-ya leona-ya commented Mar 28, 2025 •
edited
Loading

https://meta.discourse.org/t/3-3-3-security-and-maintenance-release/343239
https://meta.discourse.org/t/3-3-4-security-and-maintenance-release/349301
https://blog.discourse.org/2025/02/unpacking-discourse-3-4/
https://meta.discourse.org/t/3-4-1-bug-fix-and-ux-release/353247
https://meta.discourse.org/t/3-4-2-security-and-bug-fix-release/358152

Another annoying update of discourse.
I don't have an instance to test, but the NixOS Test is successful

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@leona-ya leona-ya added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Mar 28, 2025
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: documentation This PR adds or changes documentation labels Mar 28, 2025
@leona-ya leona-ya force-pushed the push-otrlpxkyuvly branch 2 times, most recently from 763bbce to b76ab78 Compare March 28, 2025 22:43
@leona-ya
Copy link
Member Author

leona-ya commented Mar 28, 2025

I haven't updated the update script yet. Will try to do so, but would already appreciate reviews and maybe even a merge. This can also be another PR

@github-actions github-actions 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 Mar 28, 2025
@nix-owners nix-owners bot requested a review from talyz March 28, 2025 22:44
@mweinelt mweinelt linked an issue Mar 29, 2025 that may be closed by this pull request
Update Request: discourse 3.3.3 → 3.4.2 #393520
Closed
3 tasks
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 2, 2025
mweinelt
mweinelt approved these changes Apr 2, 2025
View reviewed changes
Copy link
Member

@mweinelt mweinelt left a comment •
edited
Loading

Choose a reason for hiding this comment

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

No discourse at home, but the diff looks plausible and in large part aligns with my try to get it updated.

Can you rebase and bring the plugins up to speed? Then I think we should just go for the merge, as long as the nixos test succeeds.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one person. label Apr 3, 2025
@leona-ya leona-ya force-pushed the push-otrlpxkyuvly branch from b76ab78 to 9623255 Compare April 8, 2025 20:43
@mweinelt
Copy link
Member

mweinelt commented Apr 8, 2025

The commit message for the discourse bump still says 3.4.1

@leona-ya leona-ya force-pushed the push-otrlpxkyuvly branch 2 times, most recently from 0b63771 to e1ff59f Compare April 8, 2025 20:51
@leona-ya leona-ya changed the title discourse: 3.3.2 -> 3.4.1 discourse: 3.3.2 -> 3.4.2 Apr 8, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 8, 2025
@leona-ya
Copy link
Member Author

leona-ya commented Apr 8, 2025

Also now updated the update script and plugins.

I think this PR is not backportable as is because of the explicit postgresql requirement in the module :/ And I also don't know how strictly discourse wants to have a specific postgresql version.

@leona-ya leona-ya force-pushed the push-otrlpxkyuvly branch from e1ff59f to 9522ab8 Compare April 8, 2025 20:58
@mweinelt
Copy link
Member

mweinelt commented Apr 8, 2025

Then we flag the package on 24.11 with known vulnerabilites and link the changelogs.

@mweinelt mweinelt mentioned this pull request Apr 8, 2025
Merged
13 tasks
Atemu
Atemu approved these changes Apr 11, 2025
View reviewed changes
Copy link
Member

@Atemu Atemu left a comment

Choose a reason for hiding this comment

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

Diff broadly LGTM and it appears to work just fine in my little test instance.

Anything left to do? Else I say we send this.

@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two persons. and removed 12.approvals: 1 This PR was reviewed and approved by one person. labels Apr 12, 2025
@mweinelt mweinelt merged commit 96c56ef into NixOS:master Apr 21, 2025
28 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Apr 21, 2025

Backport failed for release-24.11, 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.11
git worktree add -d .worktree/backport-394129-to-release-24.11 origin/release-24.11
cd .worktree/backport-394129-to-release-24.11
git switch --create backport-394129-to-release-24.11
git cherry-pick -x 9d02f876c4326b06ada6ed11052357d7f355ecac f2ebbabda07227ed0a3150124989d330caea457c 9522ab87ff7e1509a85717ebc872116da66e0dcc

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

Reviewers

@mweinelt mweinelt mweinelt approved these changes

@Atemu Atemu Atemu approved these changes

@talyz talyz Awaiting requested review from talyz

Assignees

No one assigned

Labels

1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog This PR adds or changes release notes 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 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. 12.approvals: 2 This PR was reviewed and approved by two persons.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Update Request: discourse 3.3.3 → 3.4.2

4 participants

@leona-ya @mweinelt @Atemu @wegank