blythe/conduwuit
blythe/conduwuit
1
0
Fork 0
mirror of https://github.com/girlbossceo/conduwuit.git synced 2025-03-14 18:55:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5004 commits 21 branches 17 tags 17 MiB
Commit graph

46 commits

Author SHA1 Message Date
June Clementine Strawberry
df1edcf498
adjust complement cert generation 
Signed-off-by: June Clementine Strawberry <june@3.dog>
 2025-03-10 10:40:44 -04:00
June Clementine Strawberry
0b012b529f
comment gotestfmt for now 
Signed-off-by: June Clementine Strawberry <june@3.dog>
 2025-03-08 19:32:16 -05:00
June Clementine Strawberry
5efe804a20
always disable fed, evict admins, and forget the room when banning a room 
Signed-off-by: June Clementine Strawberry <june@3.dog>
 2025-03-08 18:29:19 -05:00
strawberry
5a3264980a
adjust complement script to allow using your own hs OCI image without nix 
Signed-off-by: strawberry <june@girlboss.ceo>
 2025-03-08 01:35:26 -05:00
strawberry
90fee4f50e
add gotestfmt log output to complement script and CI output 
Signed-off-by: strawberry <june@girlboss.ceo>
 2025-03-08 00:15:13 -05:00
June Clementine Strawberry
cbf207bd1f
try adding back some skipped complement tests 
Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
 2025-02-23 03:11:34 -05:00
June Clementine Strawberry
4bdd0d77db
bump complement, actually run all tests 
Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
 2025-02-23 02:52:19 -05:00
morguldir
8085a1c064
Implement MSC3967, also fixes error when uploading keys in element 
Co-authored-by: Aiden McClelland <me@drbonez.dev>

Signed-off-by: morguldir <morguldir@protonmail.com>
 2025-02-22 16:46:06 +01:00
strawberry
43e6c27bb7 misc nix tweaks to maybe speedup ci 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2025-02-06 18:27:36 -05:00
strawberry
8ed9d49b73 skip new flakey complement test 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-10-31 14:41:35 -04:00
strawberry
f6918833d7
remove -unknown- from nix flake 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-10-24 23:04:14 -04:00
strawberry
30e3e45f9f
misc CI improvements, build macOS binaries, flake improvements/fixes 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-10-24 21:29:17 -04:00
morguldir
02aee2f174
ci: retry attic push 3 times, and continue on errors 
Signed-off-by: morguldir <morguldir@protonmail.com>
 2024-09-08 20:51:34 +02:00
strawberry
35336eb686 ci: use $COMPLEMENT_SRC from nix devshell for a pinned complement rev 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-07-10 22:00:46 -04:00
strawberry
229f2fde7a skip 2 more flakey complement tests still 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-07-04 11:17:13 -04:00
strawberry
9a0ffd55da skip complement test TestClientSpacesSummary still 
too flakey still

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-07-04 01:55:22 -04:00
strawberry
c9384e9c78 allow all complement tests again 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-07-03 22:12:45 -04:00
strawberry
cd3e7394bf nix: support pushing to conduwuit.cachix.org 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-16 13:16:51 -04:00
strawberry
3c4e325036 nix(bin): cache default devshell on top of all-features devshell 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-06-03 00:10:28 -04:00
strawberry
0914aaa1b6 skip a few known flaky/unreliable complement tests 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-25 22:28:43 -04:00
Benjamin Lee
5d81203277 use a statically-linked binary for complement 
Dynamically-linked jemalloc is broken.
 2024-05-24 10:53:47 -04:00
Benjamin Lee
c0f8253fc5 enable all-features in nix for CI builds 
CI is running `cargo build --all-features`, so we should be passing all
the features to nix as well.

The only thing this currently affects is the jemalloc_prof feature, but if
we add any non-default features that affect nix in the future they should
also be handled correctly now.
 2024-05-24 10:53:47 -04:00
strawberry
2bd7a92256 complement: add -tags="conduwuit_blacklist" 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-12 03:05:34 -04:00
strawberry
1cd57f40f6 upload complement OCI image from CI, document where it can be found, use main instead of dev for tag 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-12 03:05:34 -04:00
strawberry
1f8a7a707c nix: cache complement outputs using nix-build-and-cache 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-06 03:45:10 -04:00
Charles Hall
8c21388f01 fix nix-build-and-cache 
Now it actually caches everything.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-06 03:45:10 -04:00
strawberry
35683d66dd sort the complement results by test name for consistent output 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-03 01:52:29 -04:00
strawberry
b6b739a7b7 set -vet=off to (hopefully) run all complement tests 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-03 01:52:29 -04:00
strawberry
cad16b9268 ci, nix: build and cache all packages and CI dependencies 
from f5bd9bc45e
with changes for GitHub CI and misc

Co-authored-by: Charles Hall <charles@computer.surgery>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-03 01:52:29 -04:00
strawberry
365c85ad27 use nix-output-monitor if available 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-05-03 01:52:29 -04:00
Charles Hall
63fe828120 use lib.makeScope and files to organize packages 
Some of the improvements here include:

* rocksdb can actually use jemalloc now instead of just pulling in a
  second rocksdb for no reason
* "complement-runtime" factored back out into shell file
* complement image no longer uses `mkDerivation` for `copyToRoot`
  because that's what `buildEnv` is for
* complement image no longer sets `SERVER_NAME`, complement already does
  that
* all packages were factored out into `callPackage`-able files for use
  with a custom `lib.makeScope pkgs.newScope`
* new version of `mkPackage` has options that are easier to use and
  override such as `features`
 2024-04-26 02:03:40 -04:00
AwesomeQubic
90fc2bf53e add Complement support to the nix flake 
Co-authored-by: strawberry <strawberry@puppygock.gay>
Signed-off-by: AwesomeQubic <ThatQubicWah@protonmail.com>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-26 02:03:40 -04:00
strawberry
d9ea3ffe70 raise complement test timeout to 30 minutes from 10 minutes 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
e57051acd8 run all complement tests 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
81f5492675 fix complement script 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
9883444486 allow unset variables in nix-build-and-cache for unset ATTIC_TOKEN 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
6c7bc8d7dd add back more verbose nix build logging (-L) 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-08 12:51:21 -05:00
Charles Hall
a4ec0daafa make CI more efficient (github and gitlab) 
squashed from https://gitlab.com/famedly/conduit/-/merge_requests/596

ported the relevant parts to GitHub Actions

Co-authored-by: strawberry <strawberry@puppygock.gay>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-08 12:51:21 -05:00
strawberry
3f4f0b0d3b adjust nix build script for github actions 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-03 22:20:37 -05:00
strawberry
c038da21b4 adjust complement stuff a tad 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-24 13:04:13 -05:00
strawberry
e09b2598ee update attic URL, upload to conduwuit too 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
Charles Hall
79750b9685 make complement (mostly) work again 
Well, kinda. It crashed on me after 10 minutes because the tests timed
out like in <https://github.com/matrix-org/complement/issues/394>.
Sounds like this means it's a them problem though.

I want to use Nix to build this image instead in the future but this
will at least make it work for now and give me a reference for while I'm
porting it. I also want to make Conduit natively understand Complement's
requirements instead of `sed`ing a bunch of stuff and needing a reverse
proxy in the container. Should be more reliable that way.

I'm not making this run in CI until the above stuff is addressed and
until I can decide on a way to pin the revision of Complement being
tested against.

from: https://gitlab.com/famedly/conduit/-/merge_requests/575

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry
bc421ec96b add -L to nix build command 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry
aa3fd6a47e switch cargo.toml pkg name back to conduit 
we already make it clear this is a fork with
our version and such

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-27 16:47:33 -05:00
strawberry
fd19d132eb make nix-build-and-cache executable 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 20:39:01 -05:00
Charles Hall
620bfacc30 ci: cross compile static binaries for x86_64 and aarch64 
from https://gitlab.com/famedly/conduit/-/merge_requests/569

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 19:47:54 -05:00