Skip to content

Commit 32bf9f3

Browse files
committed
ci: Try to fix osx-arm build
1 parent 610bea3 commit 32bf9f3

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
jobs:
2121
loik-pixi:
22-
name: ${{ matrix.os }} - Env ${{ matrix.environment }} ${{ matrix.build_type }} ${{ matrix.cxx_options }}
22+
name: ${{ matrix.os }} - Env ${{ matrix.environment }} ${{ matrix.build_type }}
2323
runs-on: ${{ matrix.os }}
2424
env:
2525
CCACHE_BASEDIR: ${GITHUB_WORKSPACE}
@@ -48,13 +48,11 @@ jobs:
4848
- uses: actions/cache@v4
4949
with:
5050
path: .ccache
51-
key: ccache-macos-linux-windows-pixi-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ matrix.environment }}-${{ github.sha
52-
}}
53-
restore-keys: ccache-macos-linux-windows-pixi-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.cxx_options }}-${{ matrix.environment }}-
51+
key: ccache-macos-linux-windows-pixi-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.environment }}-${{ github.sha }}
52+
restore-keys: ccache-macos-linux-windows-pixi-${{ matrix.os }}-${{ matrix.build_type }}-${{ matrix.environment }}}
5453

55-
- uses: prefix-dev/setup-pixi@v0.8.1
54+
- uses: prefix-dev/setup-pixi@v0.9.1
5655
with:
57-
pixi-version: v0.24.2
5856
cache: true
5957
environments: ${{ matrix.environment }}
6058

pixi.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ license-file = "LICENSE"
1010

1111
[tasks]
1212
configure = { cmd = ["cmake", "-G", "Ninja", "-B", "build", "-S", "."] }
13-
build = { cmd = "cmake --build build --target all", depends_on = ["configure"] }
13+
build = { cmd = "cmake --build build --target all", depends-on = ["configure"] }
1414
clean = { cmd = "rm -rf build" }
15-
test = { cmd = "ctest --test-dir build --output-on-failure", depends_on = [
15+
test = { cmd = "ctest --test-dir build --output-on-failure", depends-on = [
1616
"build",
1717
] }
1818

@@ -25,6 +25,7 @@ ninja = ">=1.12.1,<1.13"
2525

2626
[dependencies]
2727
eigen = ">=3.4.0,<3.5"
28+
python = ">=3.10"
2829
pinocchio = ">=3.0.0,<3.2"
2930
boost = ">=1.84.0,<1.85"
3031
example-robot-data = ">=4.1.0,<4.2"

0 commit comments

Comments
 (0)