Skip to content

Commit f8575ea

Browse files
committed
pixi: Fix CI namming and other mistakes
1 parent af2cbe5 commit f8575ea

File tree

2 files changed

+31
-10
lines changed

2 files changed

+31
-10
lines changed

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

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,31 @@
1-
name: Conda-CI
1+
name: CI - OSX/Linux via Conda
22

3-
on: [push,pull_request]
3+
on:
4+
push:
5+
paths-ignore:
6+
- 'doc/**'
7+
- '.gitlab-ci.yml'
8+
- '.gitignore'
9+
- '*.md'
10+
- 'LICENSE'
11+
- 'colcon.pkg'
12+
- '.pre-commit-config.yaml'
13+
pull_request:
14+
paths-ignore:
15+
- 'doc/**'
16+
- '.gitlab-ci.yml'
17+
- '.gitignore'
18+
- '*.md'
19+
- 'LICENSE'
20+
- 'colcon.pkg'
21+
- '.pre-commit-config.yaml'
422
concurrency:
523
group: ${{ github.workflow }}-${{ github.ref }}
624
cancel-in-progress: true
725

826
jobs:
927
eigenpy-conda:
10-
name: ${{ matrix.os }} - Python ${{ matrix.python-version }} ${{ matrix.build_type }} ${{ matrix.cxx_options }}
28+
name: ${{ matrix.os }} - Env ${{ matrix.environment }} ${{ matrix.build_type }} ${{ matrix.cxx_options }}
1129
runs-on: ${{ matrix.os }}
1230
env:
1331
CCACHE_BASEDIR: "${GITHUB_WORKSPACE}"
@@ -19,16 +37,19 @@ jobs:
1937
fail-fast: false
2038
matrix:
2139
os: [ubuntu-latest, macos-latest, macos-14]
22-
environment: [py38-ci, py312-ci]
40+
environment: [py38-ci, py312-ci, accelerate-ci]
2341
build_type: [Release, Debug]
24-
cxx_options: ['']
42+
cxx_options: ['', '-mavx2']
2543

26-
include:
44+
exclude:
2745
- os: ubuntu-latest
28-
environment: py312-ci
46+
environment: accelerate-ci
47+
- os: macos-latest
48+
environment: accelerate-ci
49+
- os: macos-latest
2950
cxx_options: '-mavx2'
3051
- os: macos-14
31-
environment: accelerate-ci
52+
cxx_options: '-mavx2'
3253

3354
steps:
3455
- uses: actions/checkout@v4
@@ -53,7 +74,7 @@ jobs:
5374
pixi run -e ${{ matrix.environment }} \
5475
configure \
5576
-DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
56-
-DCMAKE_CXX_OPTIONS=${{ matrix.cxx_options }}
77+
-DCMAKE_CXX_FLAGS=${{ matrix.cxx_options }}
5778
pixi run -e ${{ matrix.environment }} build
5879
pixi run -e ${{ matrix.environment }} test
5980

pixi.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ configure = { cmd = "cmake -B build -S . -DBUILD_WITH_CHOLMOD_SUPPORT=ON", depen
6060
platforms = ["osx-arm64"]
6161

6262
[feature.accelerate.tasks]
63-
configure = { cmd = "cmake -B build -S . -DBUILD_WITH_CHOLMOD_SUPPORT=ON -DBUILD_WITH_ACCELERATE_SUPPORT=ON", depends_on = [
63+
configure = { cmd = "cmake -B build -S . -DBUILD_WITH_ACCELERATE_SUPPORT=ON", depends_on = [
6464
"base_configure",
6565
] }
6666

0 commit comments

Comments
 (0)