From 1a2ad44d583c2959cca517daa5eca926bea8c503 Mon Sep 17 00:00:00 2001 From: core Date: Fri, 15 Dec 2023 22:47:46 -0500 Subject: [PATCH] fix workspace resolver and CI failure --- .forgejo/workflows/tfclient.yml | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/tfclient.yml b/.forgejo/workflows/tfclient.yml index 4768640..0829d6c 100644 --- a/.forgejo/workflows/tfclient.yml +++ b/.forgejo/workflows/tfclient.yml @@ -26,7 +26,7 @@ jobs: uses: https://github.com/actions-rs/cargo@v1 with: command: build - args: --release --bin tfclient --profile release-ci + args: --bin tfclient --profile release-ci - 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/amd64/$GITHUB_SHA/tfclient build_arm64: @@ -54,7 +54,7 @@ jobs: RUSTFLAGS: "-C linker=aarch64-linux-gnu-gcc" with: command: build - args: --release --bin tfclient --target aarch64-unknown-linux-gnu --profile release-ci + args: --bin tfclient --target aarch64-unknown-linux-gnu --profile release-ci - name: Upload binary 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: @@ -80,7 +80,7 @@ jobs: uses: https://github.com/actions-rs/cargo@v1 with: command: build - args: --release --bin tfclient --target x86_64-pc-windows-gnu --profile release-ci + args: --bin tfclient --target x86_64-pc-windows-gnu --profile release-ci - name: Compile release bundle run: ./build_windows.sh - name: Upload binary diff --git a/Cargo.toml b/Cargo.toml index 33a72ce..ec80311 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,9 +9,9 @@ members = [ "trifid-api", "trifid-api-derive" ] +resolver = "2" [profile.release-ci] inherits = "release" lto = true -resolver = "2" \ No newline at end of file