Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
build:
strategy:
matrix:
os: ['windows-latest', 'macOS-latest']
os: ['windows-2022', 'macOS-latest']

runs-on: ${{ matrix.os }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-conan-recipes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions ThirdParty/ConanRecipes/build_recipes.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@ def parse_args() -> argparse.Namespace:
"--build", default="missing", help="conan --build policy (passed as --build=<value>)"
)
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",
Expand Down Expand Up @@ -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):
Expand Down
Loading