From e67eff85d85853dd790f21112f895c2a02787b48 Mon Sep 17 00:00:00 2001 From: kindem Date: Sun, 14 Jun 2026 12:04:31 +0800 Subject: [PATCH 1/2] fix: update conan recipes build script to support select profile --- ThirdParty/ConanRecipes/build_recipes.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ThirdParty/ConanRecipes/build_recipes.py b/ThirdParty/ConanRecipes/build_recipes.py index 384f1daa..46296bc8 100644 --- a/ThirdParty/ConanRecipes/build_recipes.py +++ b/ThirdParty/ConanRecipes/build_recipes.py @@ -132,7 +132,10 @@ def parse_args() -> argparse.Namespace: "--build", default="missing", help="conan --build policy (passed as --build=)" ) parser.add_argument( - "--profile", action="append", default=[], help="conan profile (repeatable)" + "--profile", + action="append", + default=[], + help="conan profile applied to both host and build (repeatable)", ) parser.add_argument( "--conan-arg", @@ -193,7 +196,7 @@ def build_all(args: argparse.Namespace, recipes: list[Recipe], host: str): create_extra: list[str] = [] for profile in args.profile: - create_extra += ["-pr", profile] + create_extra += ["-pr:h", profile, "-pr:b", profile] create_extra += args.conan_args for index, recipe in enumerate(recipes, start=1): From c0b98bf6bfd46a2d4033ee2c9885833c8cfc9fea Mon Sep 17 00:00:00 2001 From: kindem Date: Sun, 14 Jun 2026 12:07:03 +0800 Subject: [PATCH 2/2] ci: pin Windows runner to windows-2022 The windows-latest image is rolling out VS2026, whose Conan support is still poor. Pin both workflows to the windows-2022 runner to keep CI on the VS2022 (MSVC 17.x) toolchain. --- .github/workflows/build.yml | 2 +- .github/workflows/publish-conan-recipes.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4c2be89c..681434af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: build: strategy: matrix: - os: ['windows-latest', 'macOS-latest'] + os: ['windows-2022', 'macOS-latest'] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/publish-conan-recipes.yml b/.github/workflows/publish-conan-recipes.yml index 02c35184..4fcf6b26 100644 --- a/.github/workflows/publish-conan-recipes.yml +++ b/.github/workflows/publish-conan-recipes.yml @@ -29,7 +29,7 @@ jobs: # cppstd is pinned per platform to match the binaries already on the remote; consumers on a # higher standard (the engine uses C++20) still match via Conan's default compatibility plugin. include: - - os: windows-latest + - os: windows-2022 cppstd: '17' - os: macOS-latest cppstd: gnu17