From 431a1b3b3703b0c919731f029565ae3db285716d Mon Sep 17 00:00:00 2001 From: core Date: Tue, 10 Oct 2023 18:22:55 -0400 Subject: [PATCH 1/4] Update .forgejo/workflows/tfclient.yml --- .forgejo/workflows/tfclient.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/tfclient.yml b/.forgejo/workflows/tfclient.yml index 1c11e23..6e54738 100644 --- a/.forgejo/workflows/tfclient.yml +++ b/.forgejo/workflows/tfclient.yml @@ -48,10 +48,10 @@ jobs: run: rustup target add aarch64-unknown-linux-gnu - name: Install additional dependencies run: apt update && apt-get install -y libclang-dev clang sshpass rsync gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu - - name: Set RUSTFLAGS - run: echo "-C linker=arm-linux-androideabi-gcc" >> $RUSTFLAGS - name: Compile release binary uses: https://github.com/actions-rs/cargo@v1 + env: + RUSTFLAGS: "-C linker=aarch64-linux-gnu-gcc" with: command: build args: --release --bin tfclient --target aarch64-unknown-linux-gnu From 39090a9f0ad682601380bb023f867d7d4e3be672 Mon Sep 17 00:00:00 2001 From: core Date: Tue, 10 Oct 2023 18:29:57 -0400 Subject: [PATCH 2/4] Update .forgejo/workflows/tfclient.yml --- .forgejo/workflows/tfclient.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/tfclient.yml b/.forgejo/workflows/tfclient.yml index 6e54738..2c0e32f 100644 --- a/.forgejo/workflows/tfclient.yml +++ b/.forgejo/workflows/tfclient.yml @@ -56,7 +56,7 @@ jobs: command: build args: --release --bin tfclient --target aarch64-unknown-linux-gnu - name: Upload binary - run: sshpass -p "${{ secrets.TRIFID_DLCDN_PASSWORD }}" rsync --mkpath -e 'ssh -p ${{ secrets.TRIFID_DLCDN_PORT }} -o StrictHostKeyChecking=no' target/release/tfclient ${{ secrets.TRIFID_DLCDN_USER }}@${{ secrets.TRIFID_DLCDN_IP }}:${{ secrets.TRIFID_DLCDN_PATH }}/tfclient/arm64/$GITHUB_SHA/tfclient + run: sshpass -p "${{ secrets.TRIFID_DLCDN_PASSWORD }}" rsync --mkpath -e 'ssh -p ${{ secrets.TRIFID_DLCDN_PORT }} -o StrictHostKeyChecking=no' target/aarch64-unknown-linux-gnu/release/tfclient ${{ secrets.TRIFID_DLCDN_USER }}@${{ secrets.TRIFID_DLCDN_IP }}:${{ secrets.TRIFID_DLCDN_PATH }}/tfclient/arm64/$GITHUB_SHA/tfclient build_win64: runs_on: docker steps: From 18edf13e3cdffa45f1fe2b22560ca6f0ec2421e9 Mon Sep 17 00:00:00 2001 From: core Date: Tue, 10 Oct 2023 20:04:02 -0400 Subject: [PATCH 3/4] Update trifid-api/src/codegen/mod.rs --- trifid-api/src/codegen/mod.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/trifid-api/src/codegen/mod.rs b/trifid-api/src/codegen/mod.rs index 79b9f17..809db48 100644 --- a/trifid-api/src/codegen/mod.rs +++ b/trifid-api/src/codegen/mod.rs @@ -269,7 +269,6 @@ pub async fn collect_info<'a>( let hosts = trifid_api_entities::entity::host::Entity::find() .filter(host::Column::Network.eq(&network.id)) - .filter(Condition::any().add(host::Column::IsRelay.eq(true)).add(host::Column::IsLighthouse.eq(true))) .all(&db.conn) .await?; From 7e4289755a6edc8af7b2942aaaafe23a15fbcda4 Mon Sep 17 00:00:00 2001 From: core Date: Tue, 10 Oct 2023 20:10:21 -0400 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4a89a5..3be8a62 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ The API implementation is tested with the official dnclient implementaiton, and # Documentation -You can find the documentation [here](https://man.e3t.cc/~core/trifid-docs)! +You can find the documentation [here](https://trifid.e3t.cc)! You can find the latest, bleeding-edge docs [here](https://next.trifid.e3t.cc)! Documentation work is underway. Parts of the documentation may be broken or unfinished.