Skip to content

Commit 6def744

Browse files
committed
pixi: cxx-compiler overwrite CC and CXX, so we must setup them in activation
1 parent 11d3272 commit 6def744

File tree

3 files changed

+77
-14
lines changed

3 files changed

+77
-14
lines changed

.github/workflows/macos-linux-windows-conda.yml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,12 @@ jobs:
5050
include:
5151
- os: windows-latest
5252
environment: all
53-
compiler: cl
53+
cxx_options: ''
54+
build_type: Release
5455
- os: windows-latest
55-
environment: all
56-
compiler: clang-cl
56+
environment: all-clang-cl
57+
cxx_options: ''
58+
build_type: Release
5759

5860
steps:
5961
- uses: actions/checkout@v4
@@ -72,24 +74,14 @@ jobs:
7274
cache: true
7375
environments: ${{ matrix.environment }}
7476

75-
- name: Build EigenPy [MacOS/Linux]
76-
if: contains(matrix.os, 'ubuntu') || contains(matrix.os, 'macos')
77+
- name: Build EigenPy [MacOS/Linux/Windows]
7778
env:
7879
CMAKE_BUILD_PARALLEL_LEVEL: 4
7980
EIGENPY_BUILD_TYPE: ${{ matrix.build_type }}
8081
EIGENPY_CXX_FLAGS: ${{ matrix.cxx_options }}
8182
run: |
8283
pixi run -e ${{ matrix.environment }} test
8384
84-
- name: Build EigenPy [Windows]
85-
if: contains(matrix.os, 'windows')
86-
env:
87-
CMAKE_BUILD_PARALLEL_LEVEL: 4
88-
CC: ${{ matrix.compiler }}
89-
CXX: ${{ matrix.compiler }}
90-
run: |
91-
pixi run -e ${{ matrix.environment }} test
92-
9385
check:
9486
if: always()
9587
name: check-macos-linux-windows-pixi

pixi.lock

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ python = "3.12.*"
7575
[feature.py39.dependencies]
7676
python = "3.9.*"
7777

78+
# Use clang-cl on Windows
79+
[feature.clang-cl]
80+
platforms = ["win-64"]
81+
activation = { env = { CC = "clang-cl", CXX = "clang-cl" } }
82+
7883
[environments]
7984
default = { features = ["py312"], solve-group = "py312" }
8085
lint = { features = ["lint"], solve-group = "py312" }
@@ -83,3 +88,8 @@ accelerate = { features = ["accelerate", "py312"], solve-group = "py312" }
8388
py39 = { features = ["py39"], solve-group = "py39" }
8489
all = { features = ["all", "py312"], solve-group = "py312" }
8590
all-py39 = { features = ["all", "py39"], solve-group = "py39" }
91+
all-clang-cl = { features = [
92+
"all",
93+
"clang-cl",
94+
"py312",
95+
], solve-group = "py312" }

0 commit comments

Comments
 (0)