From cdf7624d9565debcd0c0f999306d84d5b5dd6956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E7=AB=A0=E6=B4=AA?= Date: Wed, 10 Jun 2026 18:57:00 +0800 Subject: [PATCH 1/2] fix(ci): replace msbuild longbridge.sln with cmake --build for Windows windows-latest upgraded to VS2026 (MSBuild 18.6.3) which generates a different .sln filename. Using cmake --build avoids the hardcoded filename and works with any generator. Co-Authored-By: Claude Sonnet 4.6 (1M context) --- c/Makefile.toml | 12 ++++++------ cpp/Makefile.toml | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/c/Makefile.toml b/c/Makefile.toml index ec14d15719..f2243ec09d 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 907f3dad44..f0d0f4cda7 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" From be9173bc9df4b95e728b8d55fcc136fa83718b5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A2=81=E7=AB=A0=E6=B4=AA?= Date: Wed, 10 Jun 2026 19:10:15 +0800 Subject: [PATCH 2/2] fix(ci): use taiki-e/install-action to install cargo-make cargo install cargo-make fails intermittently due to crates.io network issues (HTTP2 framing errors). taiki-e/install-action downloads pre-built binaries from GitHub Releases, which is faster and more reliable. Co-Authored-By: Claude Sonnet 4.6 (1M context) --- .github/workflows/ci.yml | 4 +++- .github/workflows/release.yml | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2250a1ea3f..3b8264c606 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 d7dc64c16c..c4e9be6672 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' }}