Skip to content

Commit 8f267c3

Browse files
Merge pull request ExplosionEngine#419 from FlyAndNotDown/master
Feat: Misc Update
2 parents f5d1cbf + c0b98bf commit 8f267c3

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
build:
2020
strategy:
2121
matrix:
22-
os: ['windows-latest', 'macOS-latest']
22+
os: ['windows-2022', 'macOS-latest']
2323

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

.github/workflows/publish-conan-recipes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# cppstd is pinned per platform to match the binaries already on the remote; consumers on a
3030
# higher standard (the engine uses C++20) still match via Conan's default compatibility plugin.
3131
include:
32-
- os: windows-latest
32+
- os: windows-2022
3333
cppstd: '17'
3434
- os: macOS-latest
3535
cppstd: gnu17

ThirdParty/ConanRecipes/build_recipes.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,10 @@ def parse_args() -> argparse.Namespace:
132132
"--build", default="missing", help="conan --build policy (passed as --build=<value>)"
133133
)
134134
parser.add_argument(
135-
"--profile", action="append", default=[], help="conan profile (repeatable)"
135+
"--profile",
136+
action="append",
137+
default=[],
138+
help="conan profile applied to both host and build (repeatable)",
136139
)
137140
parser.add_argument(
138141
"--conan-arg",
@@ -193,7 +196,7 @@ def build_all(args: argparse.Namespace, recipes: list[Recipe], host: str):
193196

194197
create_extra: list[str] = []
195198
for profile in args.profile:
196-
create_extra += ["-pr", profile]
199+
create_extra += ["-pr:h", profile, "-pr:b", profile]
197200
create_extra += args.conan_args
198201

199202
for index, recipe in enumerate(recipes, start=1):

0 commit comments

Comments
 (0)