core
/
trifid
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 7 Releases Wiki Activity

Merge branch 'master' of git.e3t.cc:core/trifid
/ build (push) Successful in 2m8s Details
/ build_x64 (push) Successful in 2m13s Details
/ build_arm64 (push) Successful in 10m40s Details
/ build_win64 (push) Successful in 2m36s Details

This commit is contained in:
core 2023-10-26 18:05:41 -04:00
parent ef679a085c 7e4289755a
commit cec6c72380
Signed by: core
GPG Key ID: FDBF740DADDCEECF
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.forgejo/workflows/tfclient.yml
View File

@ -48,15 +48,15 @@ jobs:
run: rustup target add aarch64-unknown-linux-gnu run: rustup target add aarch64-unknown-linux-gnu
- name: Install additional dependencies - name: Install additional dependencies
run: apt update && apt-get install -y libclang-dev clang sshpass rsync gcc-arm-linux-gnueabi gcc-aarch64-linux-gnu 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 - name: Compile release binary
uses: https://github.com/actions-rs/cargo@v1 uses: https://github.com/actions-rs/cargo@v1
env:
RUSTFLAGS: "-C linker=aarch64-linux-gnu-gcc"
with: with:
command: build command: build
args: --release --bin tfclient --target aarch64-unknown-linux-gnu args: --release --bin tfclient --target aarch64-unknown-linux-gnu
- name: Upload binary - 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: build_win64:
runs_on: docker runs_on: docker
steps: steps:

2
README.md
View File

@ -14,7 +14,7 @@ The API implementation is tested with the official dnclient implementaiton, and
# Documentation # 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. Documentation work is underway. Parts of the documentation may be broken or unfinished.

1
trifid-api/src/codegen/mod.rs
View File

@ -269,7 +269,6 @@ pub async fn collect_info<'a>(
let hosts = trifid_api_entities::entity::host::Entity::find() let hosts = trifid_api_entities::entity::host::Entity::find()
.filter(host::Column::Network.eq(&network.id)) .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) .all(&db.conn)
.await?; .await?;