Skip to content

Commit e139b3f

Browse files
authored
Merge pull request #16 from jorisv/topic/macos-15-intel
Migrate to macos-15-intel
2 parents e01a69d + 6e717a9 commit e139b3f

File tree

3 files changed

+3347
-4913
lines changed

3 files changed

+3347
-4913
lines changed

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

Lines changed: 5 additions & 7 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}
@@ -30,7 +30,7 @@ jobs:
3030
strategy:
3131
fail-fast: false
3232
matrix:
33-
os: [ubuntu-latest, macos-latest, macos-14]
33+
os: [ubuntu-latest, macos-latest, macos-15-intel]
3434
environment: [default]
3535
build_type: [Release, Debug]
3636

@@ -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

0 commit comments

Comments
 (0)