diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2250a1ea3..3b8264c60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -302,7 +302,9 @@ jobs: uses: lukka/get-cmake@latest - name: Install cargo make - run: cargo install cargo-make + uses: taiki-e/install-action@v2 + with: + tool: cargo-make - name: Check with clippy run: cargo clippy -p longbridge-c --all-features diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d7dc64c16..c4e9be667 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -264,7 +264,9 @@ jobs: uses: lukka/get-cmake@latest - name: Install cargo make - run: cargo install cargo-make + uses: taiki-e/install-action@v2 + with: + tool: cargo-make - name: Build if: ${{ matrix.settings.target != 'aarch64-apple-darwin' }} @@ -348,7 +350,9 @@ jobs: uses: lukka/get-cmake@latest - name: Install cargo make - run: cargo install cargo-make + uses: taiki-e/install-action@v2 + with: + tool: cargo-make - name: Build if: ${{ matrix.settings.target != 'aarch64-apple-darwin' }} diff --git a/c/Makefile.toml b/c/Makefile.toml index ec14d1571..f2243ec09 100644 --- a/c/Makefile.toml +++ b/c/Makefile.toml @@ -9,13 +9,13 @@ args = ["cargo-build_longbridge_c"] cwd = "cmake.build" [tasks.c.windows] -command = "msbuild" -args = ["longbridge.sln", "-p:Configuration=Debug", "/t:cargo-build_longbridge_c"] +command = "cmake" +args = ["--build", ".", "--config", "Debug", "--target", "cargo-build_longbridge_c"] cwd = "cmake.build" [tasks.c-release.windows] -command = "msbuild" -args = ["longbridge.sln", "-p:Configuration=Release", "/t:cargo-build_longbridge_c"] +command = "cmake" +args = ["--build", ".", "--config", "Release", "--target", "cargo-build_longbridge_c"] cwd = "cmake.build" [tasks.c-test] @@ -24,6 +24,6 @@ args = ["test-c"] cwd = "cmake.build" [tasks.c-test.windows] -command = "msbuild" -args = ["longbridge.sln", "-p:Configuration=Debug", "/t:test-c"] +command = "cmake" +args = ["--build", ".", "--config", "Debug", "--target", "test-c"] cwd = "cmake.build" diff --git a/cpp/Makefile.toml b/cpp/Makefile.toml index 907f3dad4..f0d0f4cda 100644 --- a/cpp/Makefile.toml +++ b/cpp/Makefile.toml @@ -9,13 +9,13 @@ args = ["longbridge_cpp"] cwd = "cmake.build" [tasks.cpp.windows] -command = "msbuild" -args = ["longbridge.sln", "-p:Configuration=Debug", "/t:longbridge_cpp"] +command = "cmake" +args = ["--build", ".", "--config", "Debug", "--target", "longbridge_cpp"] cwd = "cmake.build" [tasks.cpp-release.windows] -command = "msbuild" -args = ["longbridge.sln", "-p:Configuration=Release", "/t:longbridge_cpp"] +command = "cmake" +args = ["--build", ".", "--config", "Release", "--target", "longbridge_cpp"] cwd = "cmake.build" [tasks.cpp-test] @@ -24,6 +24,6 @@ args = ["test-cpp"] cwd = "cmake.build" [tasks.cpp-test.windows] -command = "msbuild" -args = ["longbridge.sln", "-p:Configuration=Debug", "/t:test-cpp"] +command = "cmake" +args = ["--build", ".", "--config", "Debug", "--target", "test-cpp"] cwd = "cmake.build"