2150 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Charles Hall	a8da61e5b7	Merge branch 'docs/mdbook-full' into 'next' ... docs: build docs using mdBook and copy all markdown files See merge request famedly/conduit!604	2024-03-17 04:06:58 +00:00
Samuel Meenzen	a3968725b4	chore: add EditorConfig	2024-03-16 20:01:16 -07:00
Charles Hall	6800e5fd18	build book in ci, deploy it to gitlab pages	2024-03-16 20:01:15 -07:00
Charles Hall	4f8d3953b3	add nix output for the book	2024-03-16 20:01:15 -07:00
Samuel Meenzen	425660472c	docs: build docs using mdBook	2024-03-16 20:01:15 -07:00
Charles Hall	ab98b52b21	Merge branch 'remove-log-modification' into 'next' ... Remove log config modification See merge request famedly/conduit!553	2024-03-12 22:06:32 +00:00
Charles Hall	741ca63e94	Merge branch 'argparse' into 'next' ... Add argument parser for the conduit executable Closes #285 See merge request famedly/conduit!385	2024-03-11 18:03:39 +00:00
Max Cohen	9a81a49c6a	Add argument parser for the conduit executable ... Allow fetching the version with `conduit --version`. Fixes #285.	2024-03-11 09:43:02 -07:00
Charles Hall	c42aeb506f	Merge branch 'ci/avoid-duplicate-pipelines' into 'next' ... fix(ci): avoid duplicate pipelines See merge request famedly/conduit!600	2024-03-11 14:34:09 +00:00
Samuel Meenzen	4af691d737	fix(ci): avoid duplicate pipelines	2024-03-11 12:43:49 +01:00
Charles Hall	88fbd5b294	Merge branch 'rename-rocksdb-crate' into 'next' ... rename the `rust-rocksdb` crate to just `rocksdb` See merge request famedly/conduit!599	2024-03-11 07:03:53 +00:00
Charles Hall	d1bc7fcfd2	rename the rust-rocksdb crate to just rocksdb ... This way the old `cfg`s still work and we don't need to constantly remind ourselves what programming language we're using in `use` statements. Also fixes a problem where RocksDB users couldn't start Conduit because the old `cfg`s were using the original crate's name instead of the `backend_rocksdb` feature name for some reason. Maybe that should be changed, but I'm not sure.	2024-03-10 23:40:11 -07:00
Charles Hall	dc89fbed3a	document log config syntax, don't give example ... Because the old one was stale. Shocking!	2024-03-10 22:53:27 -07:00
Charles Hall	516876f8ef	remove final reference to sled in log config	2024-03-10 22:53:27 -07:00
Charles Hall	ed5bd23255	remove explicit references to log config ... They're all stale. Sled was yote long ago.	2024-03-10 22:53:27 -07:00
Charles Hall	5f053a9357	link to example config instead of copying it ... DRY FTW	2024-03-10 22:53:27 -07:00
Charles Hall	9ff9e85ebe	add newline to end of file ... Please, people.	2024-03-10 22:33:54 -07:00
tezlm	daed4cdddf	Remove log config modification	2024-03-10 22:17:04 -07:00
Charles Hall	086c4daa38	Merge branch 'update-rocksdb' into 'next' ... update rocksdb See merge request famedly/conduit!577	2024-03-11 04:51:40 +00:00
Charles Hall	10f3f9da49	switch/update rocksdb crate ... This fork was created because the original seems de-facto unmaintained.	2024-03-10 20:58:01 -07:00
Charles Hall	a095e02d04	Merge branch 'ci/optional-artifacts' into 'next' ... feat: run ci on demand to prevent unnecessary job executions See merge request famedly/conduit!585	2024-03-07 18:33:14 +00:00
Samuel Meenzen	0d2f1348da	feat: run ci on demand to prevent unnecessary job executions	2024-03-06 12:39:16 +01:00
Charles Hall	20bb214d7e	Merge branch 'ci-efficiency' into 'next' ... make CI more efficient See merge request famedly/conduit!596	2024-03-06 00:17:39 +00:00
Charles Hall	ae69da635b	allow overriding the attic endpoint ... And also the public key so that pulling from the new endpoint will work. This allows other people to host their own attic instances and configure their (CI) environment to override the default endpoint so e.g. they can take advantage of a binary cache without having write access to the official one. I didn't actually test this change but I think it should work. Also why'd I format the script like that, ew lol	2024-03-05 15:06:52 -08:00
Charles Hall	d411e9037c	upload all devshell inputs to the cache ... This will also include attic, so we don't need to explicitly do this in `./bin/nix-build-and-cache` anymore, which is good because that script gets called a good number of times and doing that repeatedly was a bit of a waste.	2024-03-05 15:06:52 -08:00
Charles Hall	d5a9c6ac32	use nix-built binary to produce debian package ... Currently just for `x86_64-unknown-linux-musl`. Theoretically, we can use this same mechanism for `aarch64-unknown-linux-musl`. Practically, I'm not sure just this will even work.	2024-03-05 15:06:52 -08:00
Charles Hall	4e09c9e58a	build all nix-based artifacts in a single job ... This will reduce the amount of full builds that need to be done by runs that don't have write access to the nix binary cache.	2024-03-05 15:06:52 -08:00
Charles Hall	6281c64c33	upgrade nixos/nix image	2024-03-05 15:06:51 -08:00
Charles Hall	4f352a711a	add trailing newline to file ... Please fix your editor configuration...	2024-03-05 15:06:51 -08:00
Charles Hall	10b7b174b6	fix documented target triple ... Even though it doesn't really matter because it's containerized anyway.	2024-03-05 15:06:51 -08:00
Charles Hall	e70f33741c	update flake.lock ... Also switch names to match the newer upstream nixpkgs code. Flake lock file updates: • Updated input 'attic': 'github:zhaofengli/attic/fbe252a5c21febbe920c025560cbd63b20e24f3b' (2024-01-18) → 'github:zhaofengli/attic/6eabc3f02fae3683bffab483e614bebfcd476b21' (2024-02-14) • Updated input 'fenix': 'github:nix-community/fenix/e132ea0eb0c799a2109a91688e499d7bf4962801' (2024-01-18) → 'github:nix-community/fenix/c8943ea9e98d41325ff57d4ec14736d330b321b2' (2024-03-05) • Updated input 'fenix/rust-analyzer-src': 'github:rust-lang/rust-analyzer/9d9b34354d2f13e33568c9c55b226dd014a146a0' (2024-01-17) → 'github:rust-lang/rust-analyzer/9f14343f9ee24f53f17492c5f9b653427e2ad15e' (2024-03-04) • Updated input 'flake-utils': 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15) → 'github:numtide/flake-utils/d465f4819400de7c8d874d50b982301f28a84605' (2024-02-28) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/842d9d80cfd4560648c785f8a4e6f3b096790e19' (2024-01-17) → 'github:NixOS/nixpkgs/b8697e57f10292a6165a20f03d2f42920dfaf973' (2024-03-03)	2024-03-05 15:06:51 -08:00
Charles Hall	161ad8f9a4	update to latest crane before a regression ... Once these issues are fixed, or at least just the one against crane, we can go back to `ref=master`. Flake lock file updates: • Updated input 'crane': 'github:ipetkov/crane/c798790eabec3e3da48190ae3698ac227aab770c' (2024-01-28) → 'github:ipetkov/crane/2c653e4478476a52c6aa3ac0495e4dea7449ea0e' (2024-02-11)	2024-03-05 15:06:51 -08:00
Timo Kösters	732d331847	Merge branch 'async-mutex-guards' into 'next' ... refactor: use async-aware RwLocks and Mutexes where possible See merge request famedly/conduit!595	2024-03-05 22:19:27 +00:00
Matthias Ahouansou	ee7efdd403	typo: as -> has	2024-03-05 20:31:40 +00:00
Matthias Ahouansou	07bb369c5c	perf: remove unnecessary async	2024-03-05 20:20:19 +00:00
Matthias Ahouansou	17dd8cb918	style: rename Sync(Mutex|RwLock) to Std(Mutex|RwLock)	2024-03-05 20:16:28 +00:00
Matthias Ahouansou	e33d8430d3	typo: colsures -> closures	2024-03-05 20:13:39 +00:00
Matthias Ahouansou	c58af8485d	revert: remove dependency on async_recursion	2024-03-05 19:59:24 +00:00
Matthias Ahouansou	becaad677f	refactor: use async-aware RwLocks and Mutexes where possible	2024-03-05 14:23:59 +00:00
Timo Kösters	57575b7c6f	Merge branch 'dont-give-guests-admin' into 'next' ... fix(accounts): don't give guests admin See merge request famedly/conduit!591	2024-03-04 17:00:14 +00:00
Matthias Ahouansou	4934020ee7	style: remove unnecessary else block	2024-03-04 09:33:03 +00:00
Timo Kösters	7bb480ceb8	Merge branch 'readme' into 'next' ... docs: small fixes for the README See merge request famedly/conduit!592	2024-03-03 23:13:47 +00:00
Matthias Ahouansou	da5975d727	fix: avoid panics when admin room is not available	2024-03-03 22:42:24 +00:00
Timo Kösters	56a57d5489	docs: small fixes for the README	2024-03-03 15:56:03 +01:00
Matthias Ahouansou	e06e15d4ec	fix(accounts): don't give guests admin	2024-03-03 11:26:58 +00:00
Timo Kösters	18e684b92e	Merge branch 'performance' into 'next' ... Improvements to /sync performance and db size See merge request famedly/conduit!590	2024-03-02 15:20:21 +00:00
Timo Kösters	a159fff08a	improvement: deactivate old presence code because it slows down sync ... The problem is that for each sync, it creates a new rocksdb iterator for each room, and creating iterators is somewhat expensive	2024-02-29 10:31:25 +01:00
Timo Kösters	62dda7a43f	improvement: delete old rocksdb LOG files	2024-02-29 10:28:06 +01:00
Timo Kösters	99ab234f40	Merge branch 'fixes' into 'next' ... Avoid panic when client is confused about rooms See merge request famedly/conduit!588	2024-02-28 16:19:48 +00:00
Timo Kösters	e83416bb5a	Merge branch 'fixnginx' into 'next' ... Fixed nginx proxy_pass directive See merge request famedly/conduit!589	2024-02-28 16:09:55 +00:00