studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
3,036 Commits 2 Branches 0 Tags
36774322e11279757ad82d2d0a8143b02e0304c1
Commit Graph

73 Commits

Author SHA1 Message Date
Charles Hall
36774322e1 always go through inputs 2024-04-26 02:03:40 -04:00
Charles Hall
5476a36a0b remove dead code 2024-04-26 02:03:40 -04:00
Charles Hall
d2c3275323 get complement via flake inputs 
Flake lock file updates:

• Added input 'complement':
    'github:matrix-org/complement/d73c81a091604b0fc5b6b0617dcac58c25763f57?narHash=sha256-hom/Lt0gZzLWqFhUJG0X2i88CAMIILInO5w0tPj6G3s%3D' (2024-04-18)
 2024-04-26 02:03:40 -04:00
Charles Hall
b635e807ef get rocksdb via flake inputs 
Flake lock file updates:

• Added input 'rocksdb':
    'github:facebook/rocksdb/bcf88d48ce8aa8b536aee4dd305533b3b83cf435?narHash=sha256-vRPyrXkXVVhP56n5FVYef8zbIsnnanQSpElmQLZ7mh8%3D' (2024-04-16)
 2024-04-26 02:03:40 -04:00
Charles Hall
503c0f1076 flatten and sort all flake inputs 2024-04-26 02:03:40 -04:00
Charles Hall
a260308bc9 unpin crane because the bug was fixed 
Flake lock file updates:

• Updated input 'crane':
    'github:ipetkov/crane/2c653e4478476a52c6aa3ac0495e4dea7449ea0e?narHash=sha256-XoXRS%2B5whotelr1rHiZle5t5hDg9kpguS5yk8c8qzOc%3D' (2024-02-11)
  → 'github:ipetkov/crane/55f4939ac59ff8f89c6a4029730a2d49ea09105f?narHash=sha256-Vz1KRVTzU3ClBfyhOj8gOehZk21q58T1YsXC30V23PU%3D' (2024-04-21)
 2024-04-26 02:03:40 -04:00
AwesomeQubic
999cc7ccf5 possibly fix macOS builds for nix 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-26 02:03:40 -04:00
morguldir
6c0d527b90 Use jemalloc/hmalloc for cross builds 
Signed-off-by: morguldir <morguldir@protonmail.com>
 2024-04-26 02:03:40 -04:00
morguldir
056c9d6920 Since we use crane.buildPackage we need to use cargoExtraArgs 
Signed-off-by: morguldir <morguldir@protonmail.com>
 2024-04-26 02:03:40 -04:00
morguldir
3ebf1082d6 Base oci-images on their matching alloc variant 
Co-authored-by: AwesomeQubic <ThatQubicWah@protonmail.com>
Signed-off-by: morguldir <morguldir@protonmail.com>
 2024-04-26 02:03:40 -04:00
AwesomeQubic
30b5142ecc fix flake for macos, fix jemalloc/hmalloc builds 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-26 02:03:40 -04:00
strawberry
2a987ca67a try using upstream rocksdb again 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 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
3d445dd984 bump rocksdb to 9.1.0 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-26 02:03:40 -04:00
strawberry
11a2da3819 fix flake for other oci images too 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-17 14:51:08 -04:00
strawberry
fcda7252c3 fix flake 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-17 14:51:08 -04:00
strawberry
e95e4b9200 revert tag name in nix flake for OCI images 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-17 14:51:08 -04:00
morguldir
b303a774d8 Set the time of the HEAD commit as the OCI created field 
Apparently it uses `date -Iseconds` to parse, so we can use @ with a timestamp

Also it doesn't parse `created` in buildImage, only buildLayeredImage

Signed-off-by: morguldir <morguldir@protonmail.com>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-17 14:51:08 -04:00
strawberry
5015fc7a2c add ci and flake support for using ref name to docker image tag 
also runs ci on dev branch

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-17 14:51:08 -04:00
strawberry
38b15418ca remove created date from OCI image generation 
dockerhub and github container registry don't like this,
and i have no idea what to do.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-15 07:01:00 -04:00
strawberry
775191d5c1 dont include the timestamp in the docker image created date 
i hate this

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-15 00:55:07 -04:00
strawberry
71611f0ae5 nix: try lastModifiedDate for oci image created date 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
89c22435d5 nix: simplify malloc outputs 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
354487fa10 nix: use HEAD commit's date for docker image creation and reproducible images 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
a94387dcdc maybe add multiple outputs support to nix flake for jemalloc and hardened_malloc 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-04-14 22:35:23 -04:00
strawberry
77475dacf5 bump rocksdb, switch to fork of rocksdb, bump flake 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-30 22:06:18 -04:00
Charles Hall
74c34e885e allow including extra info in --version output 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-23 01:49:27 -04:00
strawberry
ab5552ec6c Revert "bump rocksdb in nix flake" 
This reverts commit 4475c1ba259368145a9d420791d250d875b001d5.
 2024-03-23 01:49:27 -04:00
strawberry
fdb0ccc9dc bump rocksdb in nix flake 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-23 01:49:27 -04:00
Charles Hall
2de47fc9c0 add mdbook to the devshell 2024-03-23 01:49:27 -04:00
strawberry
c8c3a9ed43 docs: s/conduit-example/conduwuit-example 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-19 00:17:41 -04:00
Samuel Meenzen
e9ce642795 docs: build docs using mdBook, build in CI, deploy to gitlab pages 
squashed from https://gitlab.com/famedly/conduit/-/merge_requests/604

added differences.md

Co-authored-by: Charles Hall <charles@computer.surgery>
Co-authored-by: strawberry <strawberry@puppygock.gay>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-19 00:17:41 -04:00
strawberry
4a6d17b835 fix rocksdb hash 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-10 13:03:28 -04:00
strawberry
cd2f00e012 format flake, use rust-rocksdb fork 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-03-10 13:03:28 -04: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
5344cdbbca correct rocksdb flake version override 
this was causing rocksdb to be built with
a version of 8.3.2, but pulling 8.10.0
source code.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-26 00:40:15 -05:00
strawberry
5d7b8cd309 think this is the correct way 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
strawberry
0e7ec9f2dd update rocksdb to 8.10.0 in nix flake 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-14 19:07:08 -05:00
Raito Bezarius
0e9eb22ee7 feat: support non-flake users 
This uses flakes-compat to read the `flake.nix` and expose it
to non-flake users.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-02-11 21:56:55 -05:00
Charles Hall
d68268da2e pass pkgsCrossStatic to mkOciImage, not pkgsHost 
This fixes a bug where the aarch64 OCI image had metadata saying it was
an x86_64 OCI image. On top of that, I think the metadata was actually
right (aside from Conduit's binary): since all other packages were being
pulled from `pkgsHost`, an OCI image cross compiled for aarch64 from a
different architecture would result in unexecutable binaries (e.g. tini)
since they were compiled for the completely wrong architecture.

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

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
strawberry
fb1fa4364d downgrade rust-rocksdb back to latest stable 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -05:00
Charles Hall
8954243457 switch crane input back to upstream 
Thanks to the crane maintainer to fixing my issue in a way that doesn't
suck, unlike my attempt in the fork we were briefly using.

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

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-31 16:20:26 -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
Charles Hall
c329eb197d add ca certificates to the OCI image 
Without this, checking the authority of TLS certificates fails, making
Conduit (rightly) refuse to connect to anything.

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-27 16:47:33 -05:00
strawberry
81a4f9e539 use main instead of latest for docker tag 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-27 16:47:33 -05:00
strawberry
8793abf41f does this work 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 19:47:54 -05:00
strawberry
331b63ca40 upstream nix changes, make rocksdb git work 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-26 19:47:54 -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
strawberry
2c51cdc23b update nix flake for gitlab CI building docker images 
Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00
strawberry
1460a82f54 use engage for gitlab CI 
from https://gitlab.com/famedly/conduit/-/merge_requests/564

Signed-off-by: strawberry <strawberry@puppygock.gay>
 2024-01-25 19:28:33 -05:00