TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2059 commits 50 branches 7 tags 14 MiB
Commit graph

2059 commits

This branch
This branch
All branches
Author SHA1 Message Date
Charles Hall
2a04a361e0
break oci image builder into a function 
Now it can be reused for different `pkgs` and `package`s.
 2024-01-25 20:03:25 -08:00
Charles Hall
0e8e4f1083
add static cross to aarch64-unknown-linux-musl 2024-01-25 19:44:06 -08:00
Charles Hall
81ae579b25
add static cross to x86_64-unknown-linux-musl 2024-01-25 19:43:23 -08:00
Charles Hall
3a3cafe912
preempt cross problems by using my crane fork 
I imagine this will get fixed/merged upstream in the near future.
 2024-01-25 11:39:17 -08:00
Charles Hall
d29591d47d
group packages in attrset literal 
This will make generating packages for cross possible.
 2024-01-25 11:39:17 -08:00
Charles Hall
67d280dd2e
factor package expression into a function 
We'll need to call it repeatedly to make packages for cross.
 2024-01-25 11:39:17 -08:00
Charles Hall
3ac9be5a78
add x86_64-unknown-linux-gnu 
This is probably the most common target and usually doesn't involve
cross compilation.
 2024-01-25 11:39:17 -08:00
Charles Hall
52954f7a11
use fromToolchainFile 
I *think* this will make it easier to pull in extra rustc targets.
 2024-01-25 11:39:16 -08:00
Charles Hall
692a31620d
make let bindings take pkgs as an argument 
Again, will make cross compilation easier to set up.
 2024-01-25 11:39:16 -08:00
Charles Hall
cf4015b830
rename pkgs to pkgsHost 
This will make organizing cross compilation easier.
 2024-01-25 11:39:16 -08:00
Charles Hall
9cef03127b
remove with for nativeBuildInputs 
It's going to get more involved and that `with` was too specific.
 2024-01-25 11:39:16 -08:00
Charles Hall
249fc7769d
don't bother with mold 
For now, at least. I suspect it will make cross compilation more
difficult.
 2024-01-25 11:39:16 -08:00
Charles Hall
5cc53c9e14
push oci image and x86_64-*-gnu build to bin cache 
This will allow most Nix users to use the `default` package and without
having to build from source. And also allows any weirdos to get the OCI
image from the Nix binary cache if they want. No idea why that would be
desireable though lol
 2024-01-25 11:37:35 -08:00
Charles Hall
bdc46f6392
add script to build and push to binary cache 
This is even useful for local development, as you can pre-populate the
binary cache before running CI (assuming you have the token). Also, it
being in a script makes it easier to test.

We've added attic as a flake input even though the flake itself doesn't
use it so that we can use `--inputs-from .` in Nix commands to reference
a locked version of attic. This helps with reproducibility and caching,
and to makes it easy to update attic because it's part of the normal
flake lifecycle.
 2024-01-25 11:34:46 -08:00
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?
 2024-01-25 10:51:21 -08:00
Charles Hall
bd2b146d5d
add crane binary cache 
This way we don't need to build e.g. crane-utils every time.
 2024-01-24 23:25:48 -08:00
Charles Hall
f7cc4fb3bb
state artifacts' targets and rename artifacts 
This will make it more obvious what's what and be more internally
consistent.
 2024-01-24 23:25:42 -08:00
Charles Hall
ca198c51fa Merge branch 'reqwest-follow-up' into 'next' 
move resolver logic into the resolver

See merge request famedly/conduit!571
 2024-01-24 23:24:00 +00:00
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.
 2024-01-24 15:11:17 -08:00
Timo Kösters
c86f9a5c5b Merge branch 'pr_upstream_reqwest' into 'next' 
Use upstream `reqwest` instead of vendored one

See merge request famedly/conduit!527
 2024-01-24 21:59:34 +00:00
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
 2024-01-24 17:55:22 +00:00
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`.
 2024-01-24 17:12:43 +01:00
Timo Kösters
5cf9f3df48 Merge branch 'lints' into 'next' 
fix CI

See merge request famedly/conduit!564
 2024-01-24 15:42:20 +00:00
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.
 2024-01-24 07:22:37 -08:00
Charles Hall
4de54db305
redo docker image and build it in ci 2024-01-24 07:22:37 -08:00
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.
 2024-01-24 07:22:37 -08:00
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)
 2024-01-24 07:22:37 -08:00
Charles Hall
7e66d2e2c0
use nix and engage to manage ci 2024-01-24 07:22:37 -08:00
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.
 2024-01-24 07:22:37 -08:00
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.
 2024-01-24 07:22:37 -08:00
Charles Hall
25ceb5ebd8
remove commented out ci step 
If you want it back, just look at the git history.
 2024-01-24 07:22:37 -08:00
Charles Hall
6f052fff98
improve nix flake 
Also fix the comment in `Cargo.toml` about the rust-version stuff.
 2024-01-24 07:22:37 -08:00
Charles Hall
e8ac881b2f
add an engage file 
See <https://charles.page.computer.surgery/engage/> for info.
 2024-01-24 07:22:37 -08:00
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.
 2024-01-24 07:22:37 -08:00
Charles Hall
ab1fff2642
fix cargo clippy lints 2024-01-24 07:22:37 -08:00
Charles Hall
92c5b6b86c
fix cargo check lints 2024-01-24 07:22:25 -08:00
Charles Hall
dc2f53e773
comment out heed backend things 
The code in conduit doesn't compile.
 2024-01-18 12:27:48 -08:00
Timo Kösters
2475995102 Merge branch 'conduit/declare-1.5-support' into 'next' 
declare 1.5 support

See merge request famedly/conduit!568
 2024-01-17 17:56:21 +00:00
Charles Hall
835f4ad8cf
declare 1.5 support 2024-01-16 13:52:56 -08:00
Timo Kösters
ca6219723b Merge branch 'conduit/envrc-shebang' into 'next' 
add shebang to .envrc

See merge request famedly/conduit!566
 2023-12-24 15:36:52 +00:00
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
 2023-12-24 15:36:36 +00:00
Charles Hall
8f3f5c01f9
add shebang to .envrc 
All this really does is make syntax highlighting and shellcheck work by
default in more editors.
 2023-12-23 22:21:19 -08:00
Charles Hall
9d7f7b871b
don't panic on missing presence status for a user 2023-12-23 21:01:01 -08:00
Timo Kösters
30f0871e21 Merge branch 'sendjoin-signature-error' into 'next' 
Log underlying error when rejecting sendjoin response

See merge request famedly/conduit!563
 2023-12-11 15:11:42 +00:00
Val Lorentz
98e81c6217 Log underlying error when rejecting sendjoin response 2023-12-03 19:38:09 +01:00
AndSDev
f3b6b3e222 feat: send push notification on invite to invited user and etc 2023-11-07 12:46:53 +00:00
Timo Kösters
3bfdae795d Merge branch 'sliding' into 'next' 
Sliding sync improvements and redaction fixes

See merge request famedly/conduit!549
 2023-09-13 18:57:57 +00:00
Timo Kösters
75c80df271
Sliding sync improvements and redaction fixes 2023-09-13 20:54:53 +02:00
Timo Kösters
094cb888d4 Merge branch 'badacl' into 'next' 
fix: ACL error shouldn't break the whole request

See merge request famedly/conduit!542
 2023-09-13 18:46:03 +00:00
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
 2023-09-11 18:34:06 +00:00