Skip to content
This repository was archived by the owner on May 29, 2026. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f521f88
docs: mildly update the NixOS page to ref https://github.com/NixOS/ni…
x86pup Sep 6, 2024
909eeac
drop target CPU for aarch64 to cortex-a53 instead of cortex-a73
x86pup Sep 6, 2024
80698c0
docs: add some more conduwuit development info
x86pup Sep 6, 2024
6f643a4
bump rust to 1.81.0
x86pup Sep 7, 2024
5ae9a5f
bump nix lockfile, and ruma
x86pup Sep 7, 2024
f163ebf
implement MSC4133 only with MSC4175 for GET/PUT/DELETE
x86pup Sep 7, 2024
b3974c5
log device display name on normal user registrations too
x86pup Sep 7, 2024
f14a253
add local_only arg to list joined members in room admin cmd
x86pup Sep 7, 2024
593d3bb
nix: update flake.lock, skip building tests for liburing
morguldir Sep 8, 2024
3e0d404
syncv3: use RoomTypeFilter struct instead of Option<RoomType>
morguldir Sep 7, 2024
c47337f
docs: ignore development.md and contributing.md from lychee
x86pup Sep 8, 2024
96ab59b
bump cargo.lock
x86pup Sep 8, 2024
8dccc04
nix: explicitly include liburing in the devshell
morguldir Sep 8, 2024
1c1f300
ci: avoid propagating bash errors immidiately
morguldir Sep 8, 2024
24c408f
bump rocksdb to 9.6.1, add binutils to devshell
morguldir Sep 8, 2024
02aee2f
ci: retry attic push 3 times, and continue on errors
morguldir Sep 8, 2024
e888810
update complement results for TestFederationThumbnail
x86pup Sep 8, 2024
b44f7f5
remove MSC4175 timezone on account deactivation
x86pup Sep 8, 2024
38cd88e
remove unnecessary cloning on account deactivation profile updates
x86pup Sep 8, 2024
61347be
advertise support for MSC4133 and MSC4175
x86pup Sep 8, 2024
55f71d3
bump conduwuit to 0.4.7
x86pup Sep 8, 2024
9de780b
remove unnecessary displayname requirement on making user admin
x86pup Sep 10, 2024
38552b3
make the first user admin if created from CLI / --execute
x86pup Sep 10, 2024
cf9b72c
remove a few unnecessary muts
x86pup Sep 10, 2024
a41e63b
Add back allow_check_for_updates
morguldir Aug 15, 2024
80b7263
ci: enable cachix after restoring the cache
morguldir Sep 13, 2024
d75aebc
implement generic K-V support for MSC4133, GET/PUT/DELETE
x86pup Sep 14, 2024
e146c75
dont include appservices in room guest access enforcement check
x86pup Sep 14, 2024
a65dd6d
dont allow guests to publish to room directories
x86pup Sep 14, 2024
895b178
add admin command to force demote a local user from a room
x86pup Sep 15, 2024
17fd34e
dedupe some account deactivation steps, remove all profile fields on …
x86pup Sep 15, 2024
e9e5fe2
implement MSC4165, removing own power levels on deactivation
x86pup Sep 15, 2024
032b199
add db query command to get all pushers for a user
x86pup Sep 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 17 additions & 97 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,6 @@ jobs:

- uses: nixbuild/nix-quick-install-action@v28

- name: Enable Cachix binary cache
run: |
nix profile install nixpkgs#cachix
cachix use crane
cachix use nix-community

- name: Restore and cache Nix store
uses: nix-community/cache-nix-action@v5.1.0
with:
Expand All @@ -114,6 +108,12 @@ jobs:
# always save the cache
save-always: true

- name: Enable Cachix binary cache
run: |
nix profile install nixpkgs#cachix
cachix use crane
cachix use nix-community

- name: Apply Nix binary cache configuration
run: |
sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
Expand All @@ -138,23 +138,7 @@ jobs:

- name: Cache CI dependencies
run: |
# attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
ATTEMPTS=3
SUCCESS=false
while (( ATTEMPTS-- > 0 ))
do
bin/nix-build-and-cache ci
if [[ $? == 0 ]]; then
SUCCESS=true
break
else
sleep 3
fi
done

if [[ $SUCCESS == "false" ]]; then
exit 1
fi
bin/nix-build-and-cache ci

# use sccache for Rust
- name: Run sccache-cache
Expand Down Expand Up @@ -240,12 +224,6 @@ jobs:

- uses: nixbuild/nix-quick-install-action@v28

- name: Enable Cachix binary cache
run: |
nix profile install nixpkgs#cachix
cachix use crane
cachix use nix-community

- name: Restore and cache Nix store
uses: nix-community/cache-nix-action@v5.1.0
with:
Expand All @@ -267,6 +245,12 @@ jobs:
# always save the cache
save-always: true

- name: Enable Cachix binary cache
run: |
nix profile install nixpkgs#cachix
cachix use crane
cachix use nix-community

- name: Apply Nix binary cache configuration
run: |
sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
Expand Down Expand Up @@ -304,23 +288,7 @@ jobs:
CARGO_DEB_TARGET_TUPLE=$(echo ${{ matrix.target }} | grep -o -E '^([^-]*-){3}[^-]*')
SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)

# attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
ATTEMPTS=3
SUCCESS=false
while (( ATTEMPTS-- > 0 ))
do
bin/nix-build-and-cache just .#static-${{ matrix.target }}-all-features
if [[ $? == 0 ]]; then
SUCCESS=true
break
else
sleep 3
fi
done

if [[ $SUCCESS == "false" ]]; then
exit 1
fi
bin/nix-build-and-cache just .#static-${{ matrix.target }}-all-features

mkdir -v -p target/release/
mkdir -v -p target/$CARGO_DEB_TARGET_TUPLE/release/
Expand All @@ -344,23 +312,7 @@ jobs:
CARGO_DEB_TARGET_TUPLE=$(echo ${{ matrix.target }} | grep -o -E '^([^-]*-){3}[^-]*')
SOURCE_DATE_EPOCH=$(git log -1 --pretty=%ct)

# attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
ATTEMPTS=3
SUCCESS=false
while (( ATTEMPTS-- > 0 ))
do
bin/nix-build-and-cache just .#static-${{ matrix.target }}-all-features-debug
if [[ $? == 0 ]]; then
SUCCESS=true
break
else
sleep 3
fi
done

if [[ $SUCCESS == "false" ]]; then
exit 1
fi
bin/nix-build-and-cache just .#static-${{ matrix.target }}-all-features-debug

# > warning: dev profile is not supported and will be a hard error in the future. cargo-deb is for making releases, and it doesn't make sense to use it with dev profiles.
# so we need to coerce cargo-deb into thinking this is a release binary
Expand Down Expand Up @@ -423,45 +375,13 @@ jobs:

- name: Build OCI image ${{ matrix.target }}
run: |
# attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
ATTEMPTS=3
SUCCESS=false
while (( ATTEMPTS-- > 0 ))
do
bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}-all-features
if [[ $? == 0 ]]; then
SUCCESS=true
break
else
sleep 3
fi
done

if [[ $SUCCESS == "false" ]]; then
exit 1
fi
bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}-all-features

cp -v -f result oci-image-${{ matrix.target }}.tar.gz

- name: Build debug OCI image ${{ matrix.target }}
run: |
# attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
ATTEMPTS=3
SUCCESS=false
while (( ATTEMPTS-- > 0 ))
do
bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}-all-features-debug
if [[ $? == 0 ]]; then
SUCCESS=true
break
else
sleep 3
fi
done

if [[ $SUCCESS == "false" ]]; then
exit 1
fi
bin/nix-build-and-cache just .#oci-image-${{ matrix.target }}-all-features-debug

cp -v -f result oci-image-${{ matrix.target }}-debug.tar.gz

Expand Down
48 changes: 8 additions & 40 deletions .github/workflows/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@ jobs:

- uses: nixbuild/nix-quick-install-action@v28

- name: Enable Cachix binary cache
run: |
nix profile install nixpkgs#cachix
cachix use crane
cachix use nix-community

- name: Restore and cache Nix store
uses: nix-community/cache-nix-action@v5.1.0
with:
Expand All @@ -86,6 +80,12 @@ jobs:
# always save the cache
save-always: true

- name: Enable Cachix binary cache
run: |
nix profile install nixpkgs#cachix
cachix use crane
cachix use nix-community

- name: Apply Nix binary cache configuration
run: |
sudo tee -a "${XDG_CONFIG_HOME:-$HOME/.config}/nix/nix.conf" > /dev/null <<EOF
Expand All @@ -110,23 +110,7 @@ jobs:

- name: Cache CI dependencies
run: |
# attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
ATTEMPTS=3
SUCCESS=false
while (( ATTEMPTS-- > 0 ))
do
bin/nix-build-and-cache ci
if [[ $? == 0 ]]; then
SUCCESS=true
break
else
sleep 3
fi
done

if [[ $SUCCESS == "false" ]]; then
exit 1
fi
bin/nix-build-and-cache ci

- name: Run lychee and markdownlint
run: |
Expand All @@ -135,23 +119,7 @@ jobs:

- name: Build documentation (book)
run: |
# attic nix binary cache server is very, very terribly flakey. nothing i can do to fix it other than retry multiple times here
ATTEMPTS=3
SUCCESS=false
while (( ATTEMPTS-- > 0 ))
do
bin/nix-build-and-cache just .#book
if [[ $? == 0 ]]; then
SUCCESS=true
break
else
sleep 3
fi
done

if [[ $SUCCESS == "false" ]]; then
exit 1
fi
bin/nix-build-and-cache just .#book

cp -r --dereference result public

Expand Down
9 changes: 6 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contributing guide

This page is for about contributing to conduwuit. The
[development](development.md) page may be of interest for you as well.
[development](./development.md) page may be of interest for you as well.

If you would like to work on an [issue][issues] that is not assigned, preferably
ask in the Matrix room first at [#conduwuit:puppygock.gay][conduwuit-matrix],
Expand Down Expand Up @@ -67,7 +67,7 @@ failing from your changes, please review the logs (they are uploaded as
artifacts) and determine if they're intended or not.

If you'd like to run Complement locally using Nix, see the
[testing](docs/development/testing.md) page.
[testing](development/testing.md) page.

[Sytest][sytest] support will come soon.

Expand Down Expand Up @@ -128,7 +128,10 @@ Direct all PRs/MRs to the `main` branch.

By sending a pull request or patch, you are agreeing that your changes are
allowed to be licenced under the Apache-2.0 licence and all of your conduct is
in line with the Contributor's Covenant.
in line with the Contributor's Covenant, and conduwuit's Code of Conduct.

Contribution by users who violate either of these code of conducts will not have
their contributions accepted.

[issues]: https://github.com/girlbossceo/conduwuit/issues
[conduwuit-matrix]: https://matrix.to/#/#conduwuit:puppygock.gay
Expand Down
Loading