Skip to content

Commit fc3e223

Browse files
committed
ci: fix GitHub Actions
* use uv lock file to constrain versions used * uses latest macOS version for runner * cache key includes conan.lock for conan dependencies
1 parent 1958ff5 commit fc3e223

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/tox_matrix.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
uses: actions/cache@v3
6969
with:
7070
path: "${{steps.conan-path-script.outputs.result}}/.conan2"
71-
key: ${{ runner.os }}-conan-${{ hashFiles('conanfile.py') }}
71+
key: ${{ runner.os }}-conan-${{ hashFiles('conanfile.py') }}-${{ hashFiles('conan.lock') }}
7272

7373
- name: Prebuild Conan packages (Windows)
7474
if: |
@@ -85,8 +85,8 @@ jobs:
8585
CONAN_USER_HOME: "${{steps.conan-path-script.outputs.result}}"
8686
if: "!contains(matrix.os, 'windows') && steps.cache-conan.outputs.cache-hit != 'true'"
8787
run: |
88-
uvx --with cmake conan profile detect --exist-ok
89-
uvx --with cmake conan install conanfile.py --build missing -of /tmp/ciwheelbuilder -pr:b=default
88+
uv run --only-group=conan --frozen conan profile detect --exist-ok
89+
uv run --only-group=conan --frozen conan install conanfile.py --build missing -of /tmp/ciwheelbuilder -pr:b=default
9090
9191
9292
- name: Run Tox (Windows)

.github/workflows/wheels.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
UV_EXTRA_INDEX_URL: ${{vars.PIP_EXTRA_INDEX_URL}}
1616
strategy:
1717
matrix:
18-
os: [ubuntu-latest, windows-latest, macos-13]
18+
os: [ubuntu-latest, windows-latest, macos-latest]
1919

2020
steps:
2121
- uses: actions/checkout@v3
@@ -29,10 +29,10 @@ jobs:
2929
if: contains(matrix.os, 'windows')
3030
shell: cmd
3131
run: |
32-
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 && python -m cibuildwheel --output-dir wheelhouse
32+
"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\Tools\VsDevCmd.bat" -arch=amd64 && uv run --frozen --only-group=cibuildwheel cibuildwheel --output-dir wheelhouse
3333
env:
3434
CONAN_COMPILER_VERSION: ${{ matrix.compiler_version }}
3535
- name: Build wheels
3636
if: "!contains(matrix.os, 'windows')"
37-
run: uv run --only-group=cibuildwheel -m cibuildwheel --output-dir wheelhouse
37+
run: uv run --frozen --only-group=cibuildwheel -m cibuildwheel --output-dir wheelhouse
3838
# CIBW_SOME_OPTION: value

0 commit comments

Comments
 (0)