diff --git a/.github/workflows/build-test-macos-arm64.yml b/.github/workflows/build-test-macos-arm64.yml index 1234f4aa4..54e533979 100644 --- a/.github/workflows/build-test-macos-arm64.yml +++ b/.github/workflows/build-test-macos-arm64.yml @@ -27,7 +27,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt - name: Set up python diff --git a/.github/workflows/macos_test.yaml b/.github/workflows/macos_test.yaml index 6d7096d46..b38605a15 100644 --- a/.github/workflows/macos_test.yaml +++ b/.github/workflows/macos_test.yaml @@ -42,7 +42,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt - name: Code format check diff --git a/.github/workflows/mingw_test.yaml b/.github/workflows/mingw_test.yaml index 2a79b4ccb..a5a56b343 100644 --- a/.github/workflows/mingw_test.yaml +++ b/.github/workflows/mingw_test.yaml @@ -13,7 +13,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt diff --git a/.github/workflows/test_compiler_base.yaml b/.github/workflows/test_compiler_base.yaml index e573c5281..979443fb1 100644 --- a/.github/workflows/test_compiler_base.yaml +++ b/.github/workflows/test_compiler_base.yaml @@ -22,7 +22,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt - name: Rust code format check @@ -43,7 +43,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt - name: Compiler_base rust unit test diff --git a/.github/workflows/ubuntu_test.yaml b/.github/workflows/ubuntu_test.yaml index 25558a2bd..6182078aa 100644 --- a/.github/workflows/ubuntu_test.yaml +++ b/.github/workflows/ubuntu_test.yaml @@ -28,7 +28,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt - name: Code format check diff --git a/.github/workflows/wasm_test.yaml b/.github/workflows/wasm_test.yaml index 73ac96638..9280b84b4 100644 --- a/.github/workflows/wasm_test.yaml +++ b/.github/workflows/wasm_test.yaml @@ -14,7 +14,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt diff --git a/.github/workflows/windows_test.yaml b/.github/workflows/windows_test.yaml index 71f3cc616..08d0fd853 100644 --- a/.github/workflows/windows_test.yaml +++ b/.github/workflows/windows_test.yaml @@ -16,7 +16,7 @@ jobs: - name: Install rust nightly toolchain uses: actions-rs/toolchain@v1 with: - toolchain: 1.79 + toolchain: 1.80 override: true components: clippy, rustfmt diff --git a/docs/dev_guide/2.quick_start.md b/docs/dev_guide/2.quick_start.md index 9d30a2da7..b945d875b 100644 --- a/docs/dev_guide/2.quick_start.md +++ b/docs/dev_guide/2.quick_start.md @@ -42,7 +42,7 @@ Using a docker image is our recommended way, of course, you can also configure y #### macOS and OS X - `git` -- `Rust 1.79+` +- `Rust 1.80+` - `LLVM 12` (Optional, only for the LLVM backend and release) - `Python 3.7+` (Optional, only for integration tests) @@ -63,7 +63,7 @@ export PATH=/bin:$PATH #### Linux - `git` -- `Rust 1.79+` +- `Rust 1.80+` - `LLVM 12` (Optional, only for the LLVM backend and release) - `Python3 Building Dependencies` (Optional, only for integration tests) @@ -106,7 +106,7 @@ ln -sf /usr/bin/wasm-ld-12 /usr/bin/wasm-ld #### Windows - `git` -- `Rust 1.79+` +- `Rust 1.80+` - `LLVM 12` (Optional, only for the LLVM backend and release) - `Python 3.7+` (Only for integration tests) diff --git a/kclvm/query/src/tests.rs b/kclvm/query/src/tests.rs index 90876f650..401cdde2c 100644 --- a/kclvm/query/src/tests.rs +++ b/kclvm/query/src/tests.rs @@ -13,8 +13,14 @@ const CARGO_FILE_PATH: &str = env!("CARGO_MANIFEST_DIR"); fn get_test_dir(sub: String) -> PathBuf { let mut cargo_file_path = PathBuf::from(CARGO_FILE_PATH); - cargo_file_path.push("src/test_data"); - cargo_file_path.push(sub); + cargo_file_path.push("src"); + cargo_file_path.push("test_data"); + // Split unix and windows path + for part in sub.split("/") { + for p in part.split("\\") { + cargo_file_path.push(p); + } + } cargo_file_path }