diff options
| author | feld <feld@feld.me> | 2023-12-20 23:26:59 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2023-12-20 23:26:59 +0000 |
| commit | 344c798b4cb2a7cb65337a81d8b5a2eb27dd1be3 (patch) | |
| tree | c0fdde75c8a64b239bd86bf8ac00f48182deaa9b /config | |
| parent | 56618873af1aa08f6c271b6cd0f0cbcdfd56bcf1 (diff) | |
| parent | 928bda2e439285ef3e662290c0cc6b782909fb82 (diff) | |
| download | pleroma-344c798b4cb2a7cb65337a81d8b5a2eb27dd1be3.tar.gz pleroma-344c798b4cb2a7cb65337a81d8b5a2eb27dd1be3.zip | |
Merge branch 'fix-otp-comparison' into 'develop'
Fix invalid string comparison for OTP versions and replace with config
See merge request pleroma/pleroma!4013
Diffstat (limited to 'config')
| -rw-r--r-- | config/test.exs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index 8a42b863a..60cdacb0e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -153,6 +153,15 @@ config :pleroma, Pleroma.Upload, config_impl: Pleroma.UnstubbedConfigMock config :pleroma, Pleroma.ScheduledActivity, config_impl: Pleroma.UnstubbedConfigMock config :pleroma, Pleroma.Web.RichMedia.Helpers, config_impl: Pleroma.StaticStubbedConfigMock +peer_module = + if String.to_integer(System.otp_release()) >= 25 do + :peer + else + :slave + end + +config :pleroma, Pleroma.Cluster, peer_module: peer_module + if File.exists?("./config/test.secret.exs") do import_config "test.secret.exs" else |