Charles Hall
6ae776218c
add our own binary cache
...
The machine I'm hosting this on doesn't have incredible upload speeds
but it should be good enough?
7 months ago
Charles Hall
bd2b146d5d
add crane binary cache
...
This way we don't need to build e.g. crane-utils every time.
7 months ago
Charles Hall
f7cc4fb3bb
state artifacts' targets and rename artifacts
...
This will make it more obvious what's what and be more internally
consistent.
7 months ago
Charles Hall
ca198c51fa
Merge branch 'reqwest-follow-up' into 'next'
...
move resolver logic into the resolver
See merge request famedly/conduit!571
7 months ago
Charles Hall
fe86d28428
move resolver logic into the resolver
...
Honestly not sure why it wasn't done like this before. This code is much
less awkward to follow and more compartmentalized.
These changes were mainly motivated by a clippy lint triggering on the
original code, which then made me wonder if I could get rid of some of
the `Box`ing. Turns out I could, and this is the result of that.
7 months ago
Timo Kösters
c86f9a5c5b
Merge branch 'pr_upstream_reqwest' into 'next'
...
Use upstream `reqwest` instead of vendored one
See merge request famedly/conduit!527
7 months ago
Timo Kösters
e0358a9de5
Merge branch 'send_push_to_invited_user' into 'next'
...
feat: send push notification on invite to invited user and etc
Closes #399
See merge request famedly/conduit!559
7 months ago
Tobias Bucher
69d0003222
Use upstream `reqwest` instead of vendored one
...
This uses the `ClientBuilder::dns_resolver` function that was added in
reqwest 0.11.13, instead of the homebrew `ClientBuilder::resolve_fn`.
7 months ago
Timo Kösters
5cf9f3df48
Merge branch 'lints' into 'next'
...
fix CI
See merge request famedly/conduit!564
7 months ago
Charles Hall
0b7ed5adc9
add debian package building in ci
...
This uses a separate step and docker image, which I'm not a huge fan of.
At least I could get this to work for now, but I won't be shocked when
it breaks later. I know, I know, fixing this kind of problem is the
exact reason I bothered to do this, but I was really struggling to do
better here. Maybe I can take a second pass at this later.
Also, this explicitly names the caches, because without this, various
things related to linking will break.
7 months ago
Charles Hall
4de54db305
redo docker image and build it in ci
7 months ago
Charles Hall
02781e4f9b
use nix-filter to filter sources
...
This prevents nix from rebuilding conduit when files that don't actually
effect the build are changed.
7 months ago
Charles Hall
f8bdfd82b0
update flake.lock
...
Flake lock file updates:
• Updated input 'crane':
'github:ipetkov/crane/8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e' (2023-07-07)
→ 'github:ipetkov/crane/742170d82cd65c925dcddc5c3d6185699fbbad08' (2024-01-18)
• Removed input 'crane/flake-compat'
• Removed input 'crane/flake-utils'
• Removed input 'crane/rust-overlay'
• Removed input 'crane/rust-overlay/flake-utils'
• Removed input 'crane/rust-overlay/nixpkgs'
• Updated input 'fenix':
'github:nix-community/fenix/39096fe3f379036ff4a5fa198950b8e79defe939' (2023-07-16)
→ 'github:nix-community/fenix/e132ea0eb0c799a2109a91688e499d7bf4962801' (2024-01-18)
• Updated input 'fenix/rust-analyzer-src':
'github:rust-lang/rust-analyzer/996e054f1eb1dbfc8455ecabff0f6ff22ba7f7c8' (2023-07-15)
→ 'github:rust-lang/rust-analyzer/9d9b34354d2f13e33568c9c55b226dd014a146a0' (2024-01-17)
• Updated input 'flake-utils':
'github:numtide/flake-utils/919d646de7be200f3bf08cb76ae1f09402b6f9b4' (2023-07-11)
→ 'github:numtide/flake-utils/1ef2e671c3b0c19053962c07dbda38332dcebf26' (2024-01-15)
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/8acef304efe70152463a6399f73e636bcc363813' (2023-07-15)
→ 'github:NixOS/nixpkgs/842d9d80cfd4560648c785f8a4e6f3b096790e19' (2024-01-17)
7 months ago
Charles Hall
7e66d2e2c0
use nix and engage to manage ci
7 months ago
Charles Hall
ffd03a256b
remove workflow rules
...
I don't think these are actually necessary? At least in my own testing,
I haven't seen duplicate pipelines for a single commit when converting
from just a branch to a merge request.
7 months ago
Charles Hall
9d592d60d2
remove dockerlint step because it does nothing
...
It's configured to let the pipeline pass even if there are warnings or
errors, i.e. it's pointless.
7 months ago
Charles Hall
25ceb5ebd8
remove commented out ci step
...
If you want it back, just look at the git history.
7 months ago
Charles Hall
6f052fff98
improve nix flake
...
Also fix the comment in `Cargo.toml` about the rust-version stuff.
7 months ago
Charles Hall
e8ac881b2f
add an engage file
...
See <https://charles.page.computer.surgery/engage/ > for info.
7 months ago
Charles Hall
0d17aedae5
fix `cargo doc` lints
...
Rustdoc (rightfully) thought the `[commandbody]` "tags" were broken
links, so I've just made them links to nothing instead.
7 months ago
Charles Hall
ab1fff2642
fix `cargo clippy` lints
7 months ago
Charles Hall
92c5b6b86c
fix `cargo check` lints
7 months ago
Charles Hall
dc2f53e773
comment out heed backend things
...
The code in conduit doesn't compile.
7 months ago
Timo Kösters
2475995102
Merge branch 'conduit/declare-1.5-support' into 'next'
...
declare 1.5 support
See merge request famedly/conduit!568
7 months ago
Charles Hall
835f4ad8cf
declare 1.5 support
7 months ago
Val Lorentz
8175bc1246
Explicitly match RoomVersionId::V11
8 months ago
Val Lorentz
eb7ac91cd5
Reuse existing get_room_version
8 months ago
Timo Kösters
ca6219723b
Merge branch 'conduit/envrc-shebang' into 'next'
...
add shebang to .envrc
See merge request famedly/conduit!566
8 months ago
Timo Kösters
40c7c248fb
Merge branch 'conduit/rm-presence-panic' into 'next'
...
don't panic on missing presence status for a user
See merge request famedly/conduit!565
8 months ago
Charles Hall
8f3f5c01f9
add shebang to .envrc
...
All this really does is make syntax highlighting and shellcheck work by
default in more editors.
8 months ago
Charles Hall
9d7f7b871b
don't panic on missing presence status for a user
8 months ago
Timo Kösters
30f0871e21
Merge branch 'sendjoin-signature-error' into 'next'
...
Log underlying error when rejecting sendjoin response
See merge request famedly/conduit!563
8 months ago
Val Lorentz
98e81c6217
Log underlying error when rejecting sendjoin response
9 months ago
Val Lorentz
5a7bb1e8f1
Return error instead of panic when first event is not m.room.create
9 months ago
Val Lorentz
520806d413
Use Ruma's redact_content_in_place instead of custom implementation
9 months ago
Val Lorentz
9646439a94
Enable support for room v11
9 months ago
Val Lorentz
fac995036a
create_hash_and_sign_event: Use actual version of RoomCreate events, instead of the default
9 months ago
Val Lorentz
18bfd79ef2
Remove "creator" key when upgrading rooms to v11
9 months ago
Val Lorentz
a3b8eea9b4
Move "redacts" key to "content" in redaction events in v11 rooms
9 months ago
Val Lorentz
d39d30008a
Remove "creator" property from rooms >= v11
9 months ago
AndSDev
f3b6b3e222
feat: send push notification on invite to invited user and etc
10 months ago
Timo Kösters
3bfdae795d
Merge branch 'sliding' into 'next'
...
Sliding sync improvements and redaction fixes
See merge request famedly/conduit!549
11 months ago
Timo Kösters
75c80df271
Sliding sync improvements and redaction fixes
11 months ago
Timo Kösters
094cb888d4
Merge branch 'badacl' into 'next'
...
fix: ACL error shouldn't break the whole request
See merge request famedly/conduit!542
11 months ago
Timo Kösters
fa725a14e2
Merge branch 'lukehmcc-next-patch-37096' into 'next'
...
Update README.md to fix typo & fix compatibility with new versions of docker compose
See merge request famedly/conduit!545
11 months ago
Luke McCarthy
9b3664aeeb
Update README.md to fix typo & fix compatibility with new versions of docker compose
12 months ago
Jonas Zohren
90fea00dc7
Merge branch 'docs-docker-coturn' into 'next'
...
Docs: coturn instructions for docker
See merge request famedly/conduit!498
1 year ago
Jonas Zohren
20924a44f1
Suggestion on how to generate a secure key
1 year ago
purplemeteorite
38d6426b0e
coturn setup instructions for docker
1 year ago
Timo Kösters
9b55ce933a
Back off from more events, don't retry auth events
1 year ago