From 54eebd965a4d5aac2a381534ed09ebf8e1559160 Mon Sep 17 00:00:00 2001 From: Mr Martian Date: Fri, 1 Nov 2024 04:05:24 -0400 Subject: [PATCH] test updated action script --- .github/workflows/test.yml | 21 +++++++++------------ Cargo.toml | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 26f02de..24c1b35 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,6 +17,7 @@ jobs: with: submodules: recursive fetch-depth: 0 + path: s2-tools-checkout # This will create a new directory to avoid nesting - name: Set up Bun uses: oven-sh/setup-bun@v1 @@ -34,25 +35,21 @@ jobs: with: toolchain: nightly override: true - - - name: Install Rustfmt - run: rustup component add rustfmt --toolchain nightly - - - name: Install Clippy - run: rustup component add clippy --toolchain nightly + components: rustfmt, clippy + + - name: Build Rust project + run: cargo build + shell: bash - name: Run Clippy run: cargo clippy --workspace --package geometry -- -D warnings shell: bash - - - name: Build Rust project - run: cargo +nightly build - shell: bash + working-directory: s2-tools-checkout/rust/geometry - name: Check Formatting - run: cargo +nightly fmt -- --check + run: cargo fmt -- --check shell: bash - name: Run Rust tests - run: cargo +nightly test --lib + run: cargo test --lib shell: bash diff --git a/Cargo.toml b/Cargo.toml index 98dc7d2..ac6e6ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ default-members = [ ] [workspace.package] -name = "s2-tools" +# name = "s2-tools" version = "1.0.0" edition = "2021" authors = ["Craig O'Connor "]