mattermost: use formats.json; squash systemd-tmpfiles warning #376838
+175
−105
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32e542e to
8c8385a
Compare
d5eca8b to
4bd073f
Compare
numinit
commented
Jan 26, 2025
| @@ -756,7 +767,7 @@ in | |||
| "d= ${tempDir} 0750 ${cfg.user} ${cfg.group} - -" | |||
|
|
|||
| # Ensure that pluginDir is a directory, as it could be a symlink on prior versions. | |||
| "r- ${pluginDir} - - - - -" | |||
There was a problem hiding this comment.
These r- caused the warning ("unable to remove..."). d= will make sure they're a directory instead of a symlink to one.
numinit
commented
Jan 26, 2025
| with pkgs; | ||
| map ( | ||
| plugin: | ||
| stdenv.mkDerivation { |
There was a problem hiding this comment.
No CC needed in these, and we can symlink prior to repacking.
numinit
commented
Jan 26, 2025
| mostlyMutableToplevel: str, mostlyMutable, | ||
| def switch_to_specialisation(node, toplevel: str, specialisation: str): | ||
| print(f"switch_to_specialisation({node.name!r}, {toplevel!r}, {specialisation!r})", file=sys.stderr) | ||
| node.succeed(f"{toplevel}/specialisation/{specialisation}/bin/switch-to-configuration switch || true") |
There was a problem hiding this comment.
For a variety of reasons, the config switch can fail for unrelated reasons to Mattermost if we're on unstable, but Mattermost may still restart. We should just wait for it to come up.
4bd073f to
c896ae1
Compare
d4d14d2 to
59251bd
Compare
|
Rebased against master and added formats support. |
drupol
reviewed
Feb 20, 2025
59251bd to
79bdf00
Compare
|
Should be good to go. |
RossComputerGuy
approved these changes
Mar 11, 2025
drupol
approved these changes
Mar 11, 2025
|
|
79bdf00 to
0ed8a55
Compare
|
Rebased, let's try that. |
|
Alright, trying it now. |
There was a systemd-tmpfiles warning about not being able to remove the
'plugins' directory. Squash this warning through removal of unnecessary
systemd-tmpfiles options, and write a test for it.
Add the {option}`services.mattermost.pluginsBundle` option to allow
overriding the plugin directory and also using it for tests. Update
wording in option documentation so it is more clear.
Use formats.json instead of builtins.toJSON so module merging works.
Make the tests go faster by pipelining shutdowns of nodes.
0ed8a55 to
e4d40ca
Compare
|
Changed nixos/mattermost -> mattermost in the commit message so eval works. |
|
Seems to fail on aarch64 with: --- FAIL: TestUploadFiles/simple_Happy_image_thumbnail/preview_6_[orientation_test_6.jpeg] (1.76s) So the thumbnail generation for posts is nondeterministic on aarch64... |
These were added fairly recently, and apparently test that thumbnailing an image exactly matches a reference image, which varies by arch.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a systemd-tmpfiles warning about not being able to remove the 'plugins' directory. Squash this warning through removal of unnecessary systemd-tmpfiles options, and write a test for it.
Add the {option}
services.mattermost.pluginsBundleoption to allow overriding the plugin directory and also using it for tests. Update wording in option documentation so it is more clear.Use formats.json instead of builtins.toJSON so module merging works.
Make the tests go faster by pipelining shutdowns of nodes.
Followup to #208181 which introduced these minor nits.
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-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.