From df77f30e4e4c0b3a226d0579f7c8f0b4474c3605 Mon Sep 17 00:00:00 2001 From: iHsin Date: Wed, 10 Apr 2024 17:43:37 +0800 Subject: [PATCH] ci: fix bypass --- .github/workflows/ci.yml | 12 ++++++------ clash_lib/build.rs | 5 ----- 2 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 clash_lib/build.rs diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a5756a387..a83507347 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,12 +41,12 @@ jobs: run: cargo clippy --all --all-features -- -D warnings - name: Run cargo test on Linux if: ${{ matrix.platforms.os == 'ubuntu-22.04' }} - run: cargo test --all --all-features + run: cargo test --all --all-features --verbose - name: Run cargo test on non LInux - env: # this is a bit counter intuitive - some tests relies on Docker to run and are marked not(ci), but macos runner doesn't have Docker installed, so we make it "ci" to bypass those tests - CLASH_RS_CI: 'true' if: ${{ matrix.platforms.os != 'ubuntu-22.04' }} - run: cargo test --all --all-features + run: cargo test --all --all-features --verbose + env: # this is a bit counter intuitive - some tests relies on Docker to run and are marked not(ci), but macos runner doesn't have Docker installed, so we make it "ci" to bypass those tests + RUSTFLAGS: "--cfg ci" - name: Build artifacts run: sh ./scripts/build.sh "${{ matrix.platforms.target }}" "${{ matrix.static }}" - name: Stash artifacts @@ -59,12 +59,12 @@ jobs: - name: Create Release if: contains(github.ref, 'tags/v') id: create_release - uses: softprops/action-gh-release@v2 + uses: softprops/action-gh-release@v2 with: generate_release_notes: true - name: Upload Release Asset if: contains(github.ref, 'tags/v') - id: upload-release-asset + id: upload-release-asset uses: dwenegar/upload-release-assets@v2 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/clash_lib/build.rs b/clash_lib/build.rs deleted file mode 100644 index 4c2fde659..000000000 --- a/clash_lib/build.rs +++ /dev/null @@ -1,5 +0,0 @@ -fn main() { - if std::env::var("CLASH_RS_CI").is_ok() { - println!("cargo::rustc-cfg=ci"); - } -}