Commit Graph

2062 Commits (9453dbc7408c2ad043c5801bd0f25edd2f1769b7)
 

Author SHA1 Message Date
Charles Hall 9453dbc740
update rust toolchain
It comes with a bunch of new lints (yay!) so I fixed them all so CI will
keep working.

Also apparently something about linking changed because I had to change
the checks for deciding the linker flags for static x86_64 builds to
keep working.
5 months ago
Charles Hall bf48c10d28 Merge branch 'cross' into 'next'
cross compile static binaries for x86_64 and aarch64

See merge request famedly/conduit!569
5 months ago
Charles Hall 7c1a3e41d9
add package to build an aarch64 oci image
And build it as an artifact in CI.
5 months ago
Charles Hall 2a04a361e0
break oci image builder into a function
Now it can be reused for different `pkgs` and `package`s.
5 months ago
Charles Hall 0e8e4f1083
add static cross to aarch64-unknown-linux-musl 5 months ago
Charles Hall 81ae579b25
add static cross to x86_64-unknown-linux-musl 5 months ago
Charles Hall 3a3cafe912
preempt cross problems by using my crane fork
I imagine this will get fixed/merged upstream in the near future.
5 months ago
Charles Hall d29591d47d
group packages in attrset literal
This will make generating packages for cross possible.
5 months ago
Charles Hall 67d280dd2e
factor package expression into a function
We'll need to call it repeatedly to make packages for cross.
5 months ago
Charles Hall 3ac9be5a78
add x86_64-unknown-linux-gnu
This is probably the most common target and usually doesn't involve
cross compilation.
5 months ago
Charles Hall 52954f7a11
use fromToolchainFile
I *think* this will make it easier to pull in extra rustc targets.
5 months ago
Charles Hall 692a31620d
make let bindings take pkgs as an argument
Again, will make cross compilation easier to set up.
5 months ago
Charles Hall cf4015b830
rename pkgs to pkgsHost
This will make organizing cross compilation easier.
5 months ago
Charles Hall 9cef03127b
remove `with` for `nativeBuildInputs`
It's going to get more involved and that `with` was too specific.
5 months ago
Charles Hall 249fc7769d
don't bother with mold
For now, at least. I suspect it will make cross compilation more
difficult.
5 months ago
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
5 months ago
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.
5 months ago
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?
5 months ago
Charles Hall bd2b146d5d
add crane binary cache
This way we don't need to build e.g. crane-utils every time.
5 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.
5 months ago
Charles Hall ca198c51fa Merge branch 'reqwest-follow-up' into 'next'
move resolver logic into the resolver

See merge request famedly/conduit!571
5 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.
5 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
5 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
5 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`.
5 months ago
Timo Kösters 5cf9f3df48 Merge branch 'lints' into 'next'
fix CI

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

See merge request famedly/conduit!566
6 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
6 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.
6 months ago
Charles Hall 9d7f7b871b
don't panic on missing presence status for a user 6 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
7 months ago
Val Lorentz 98e81c6217 Log underlying error when rejecting sendjoin response 7 months ago
AndSDev f3b6b3e222 feat: send push notification on invite to invited user and etc 8 months ago
Timo Kösters 3bfdae795d Merge branch 'sliding' into 'next'
Sliding sync improvements and redaction fixes

See merge request famedly/conduit!549
9 months ago