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.

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

mattermostLatest: init at 10.4.1; mattermost: 9.11.6 -> 9.11.7 #373113

Merged
merged 5 commits into from
Jan 19, 2025
Merged

mattermostLatest: init at 10.4.1; mattermost: 9.11.6 -> 9.11.7 #373113

merged 5 commits into from
Jan 19, 2025

Conversation

numinit
Copy link
Contributor

@numinit numinit commented Jan 12, 2025 •
edited
Loading

Create mattermostLatest to pull in the latest Mattermost. This works fine with all the NixOS tests, but that won't be PRed here. Instead, we will do it in #208181 which will not be backported. If people choose the latest Mattermost, they are accepting a little less stability (in general, but especially for now).

Depends-on: #373085

Backport label this since it affects the autoupdate.

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.

@github-actions github-actions bot added the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jan 12, 2025
@numinit numinit requested a review from fsagbuya January 12, 2025 04:37
@numinit numinit added the backport release-24.11 Backport PR automatically label Jan 12, 2025
@numinit numinit force-pushed the mattermost/latest branch 2 times, most recently from 7adc08b to e7f7bea Compare January 13, 2025 07:34
@github-actions github-actions bot removed the 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS label Jan 13, 2025
@numinit numinit marked this pull request as ready for review January 13, 2025 07:45
@numinit
Copy link
Contributor Author

numinit commented Jan 13, 2025

@fsagbuya No changes were necessary for this to get it working

@numinit numinit requested a review from drupol January 13, 2025 07:55
@fsagbuya
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 373113

@fsagbuya
Copy link
Contributor

LGTM. :)

@numinit
Copy link
Contributor Author

numinit commented Jan 13, 2025

Looks like an empty result? In any case I think it's just a nix-build -A mattermostLatest

@fsagbuya
Copy link
Contributor

fsagbuya commented Jan 13, 2025 •
edited
Loading

Looks like an empty result? In any case I think it's just a nix-build -A mattermostLatest

nix-build -A mattermostLatest && ls -lhLS result/
/nix/store/zspzwzcf4mvq44szgchvvah3xl1qzb0k-mattermost-10.3.1
total 52K
dr-xr-xr-x 8 root root  28K Jan  1  1970 client
dr-xr-xr-x 2 root root 4.0K Jan  1  1970 bin
dr-xr-xr-x 2 root root 4.0K Jan  1  1970 config
dr-xr-xr-x 2 root root 4.0K Jan  1  1970 fonts
dr-xr-xr-x 2 root root 4.0K Jan  1  1970 i18n
dr-xr-xr-x 3 root root 4.0K Jan  1  1970 templates

Package built. Can nixosTests.mattermost be applied to this as well?

EDIT: Okay, I think you already mentioned that in the description. Otherwise, I'm good with this PR. Nice!

@numinit
Copy link
Contributor Author

numinit commented Jan 13, 2025

It will be in #208181, but I manually replaced pkgs.mattermost with pkgs.mattermostLatest and they all passed. #208181 changes the module enough (in a backwards compatible way, but a way that affects the tests nonetheless) that it's probably not worth casing out the tests in this PR.

I've not pushed up the changes just yet but it starts with Mattermost ESR and then switches to a config specialization that switches to mattermostLatest to make sure migrations work.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-already-reviewed/2617/2193

@numinit
Copy link
Contributor Author

numinit commented Jan 19, 2025

Should be good to merge. We should try to prioritize it since Mattermost updates once a month.

@drupol do you mind taking a look? :-)

@numinit
Copy link
Contributor Author

numinit commented Jan 19, 2025 •
edited
Loading

@drupol Out of curiosity does the NixOS 24.11 branch support tag? If it doesn't I need to change it back or do it in two commits.

Edit: I see it does, full steam ahead 🔥

@drupol
Copy link
Contributor

drupol commented Jan 19, 2025

Yes: #362113

@numinit
mattermostLatest: 10.3.1 -> 10.4.1
cbd54cc 
Add a lockfileOverlay option that lets us make changes to the package
lockfile if it's broken, such as unlocking packages and letting
npm-lockfile-fix handle them if they are mis-locked.
@numinit
mattermost: 9.11.6 -> 9.11.7
3a98e4e
@numinit numinit changed the title mattermostLatest: init at 10.3.1 mattermostLatest: init at 10.4.1; mattermost: 9.11.6 -> 9.11.7 Jan 19, 2025
@numinit
Copy link
Contributor Author

numinit commented Jan 19, 2025 •
edited
Loading

A Mattermost update snuck in!

https://github.com/mattermost/mattermost/releases/tag/v10.4.1
https://github.com/mattermost/mattermost/releases/tag/v9.11.7

Good opportunity to check the update scripts (which worked well). Had to override one of the NPM dependencies for 10.4.1 so introduced an option for that.

NixOS tests all still pass.

@numinit
mattermostLatest: track 10.x instead of 10.4.x
5a5938f 
We get a new 10.x release every month, so just track latest.
@numinit numinit requested a review from drupol January 19, 2025 09:49
@numinit numinit mentioned this pull request Jan 19, 2025
Merged
13 tasks
@drupol drupol merged commit 05e1afc into NixOS:master Jan 19, 2025
25 of 27 checks passed
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 19, 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-373113-to-release-24.11 origin/release-24.11
cd .worktree/backport-373113-to-release-24.11
git switch --create backport-373113-to-release-24.11
git cherry-pick -x 6572a7a52a95be7094e3beb8fae311272a53e99a 88ef3d9e3473064e5fcfb0fea4f6e04dfa42db47 cbd54cce90b2c780e91998080c4ac16cf2d380be 3a98e4ee47a034d87eefad32b99eedee0da29b6d 5a5938f361337ad9853e25005c2b3aca1ee2ef95

@numinit numinit mentioned this pull request Jan 19, 2025
Merged
13 tasks
@numinit numinit added the 1.severity: security Issues which raise a security issue, or PRs that fix one label Jan 19, 2025
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 19, 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-373113-to-release-24.11 origin/release-24.11
cd .worktree/backport-373113-to-release-24.11
git switch --create backport-373113-to-release-24.11
git cherry-pick -x 6572a7a52a95be7094e3beb8fae311272a53e99a 88ef3d9e3473064e5fcfb0fea4f6e04dfa42db47 cbd54cce90b2c780e91998080c4ac16cf2d380be 3a98e4ee47a034d87eefad32b99eedee0da29b6d 5a5938f361337ad9853e25005c2b3aca1ee2ef95

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

@drupol drupol drupol approved these changes

@fsagbuya fsagbuya Awaiting requested review from fsagbuya

@Kranzes Kranzes Awaiting requested review from Kranzes

@ryantm ryantm Awaiting requested review from ryantm

@mgdelacroix mgdelacroix Awaiting requested review from mgdelacroix

Assignees
No one assigned
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@numinit @fsagbuya @nixos-discourse @drupol