Merge branch 'master' of git.e3t.cc:core/trifid
This commit is contained in:
commit
cec6c72380
|
@ -48,15 +48,15 @@ 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
|
||||
- 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:
|
||||
|
|
|
@ -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.
|
||||
|
||||
|
|
|
@ -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?;
|
||||
|
||||
|
|
Loading…
Reference in New Issue