Skip to content

Commit

Permalink
Update the CI versions
Browse files Browse the repository at this point in the history
  • Loading branch information
pseudo-rnd-thoughts committed Apr 23, 2024
1 parent 5c432d7 commit b352210
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 34 deletions.
54 changes: 25 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ jobs:
pre-commit:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
- uses: pre-commit/action@v2.0.3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
- uses: pre-commit/action@v3.0.1

tests:
name: ${{ matrix.runs-on }} • py${{ matrix.python }}
Expand Down Expand Up @@ -68,29 +70,29 @@ jobs:
python: '3.12'
triplet: x64-osx-mixed

# - runs-on: windows-latest
# python: '3.8'
# triplet: x64-windows
# - runs-on: windows-latest
# python: '3.9'
# triplet: x64-windows
# - runs-on: windows-latest
# python: '3.10'
# triplet: x64-windows
# - runs-on: windows-latest
# python: '3.11'
# triplet: x64-windows
# - runs-on: windows-latest
# python: '3.12'
# triplet: x64-windows
- runs-on: windows-latest
python: '3.8'
triplet: x64-windows
- runs-on: windows-latest
python: '3.9'
triplet: x64-windows
- runs-on: windows-latest
python: '3.10'
triplet: x64-windows
- runs-on: windows-latest
python: '3.11'
triplet: x64-windows
- runs-on: windows-latest
python: '3.12'
triplet: x64-windows
env:
VCPKG_DEFAULT_TRIPLET: ${{ matrix.triplet }}
runs-on: ${{ matrix.runs-on }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: actions/setup-python@v2
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python }}

Expand All @@ -99,16 +101,16 @@ jobs:
# As a temporary workaround installing cmake outside of the isolated env seems to work.
run: python -m pip install --user cmake

- uses: microsoft/setup-msbuild@v1.1
- uses: microsoft/setup-msbuild@v2
if: runner.os == 'Windows'
# TODO(jfarebro): 02/16/2023 - There's a bug where pkg-config isn't installed on the macOS
# runner. See: https://github.com/actions/runner-images/pull/7125
- name: Install pkg-config on macOS
if: runner.os == 'macOS'
run: brew install pkg-config
- uses: lukka/run-vcpkg@v10
- uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: "9aa0d66373ce3a6868d12353d0d4960db0d4bd18"
vcpkgGitCommitId: "5b1214315250939257ef5d62ecdcbca18cf4fb1c"
# There's a permissions issue with the cache
# https://github.com/microsoft/vcpkg/issues/20121
doNotCache: true
Expand All @@ -122,9 +124,3 @@ jobs:
- name: Test
run: python -m pytest

# Enable tmate debugging of manually-triggered workflows if the input option was provided
- name: Setup SSH debug session on failure
uses: mxschmitt/action-tmate@v3
if: ${{ github.event_name == 'workflow_dispatch' && inputs.debug_enabled && failure() }}
with:
limit-access-to-actor: true
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ jobs:
wheels:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- uses: ./.github/actions/download-release-asset
name: Download release wheels
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
arch: arm64
runs-on: ${{ matrix.runs-on }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Docker
if: runner.os == 'Linux'
Expand All @@ -34,7 +34,7 @@ jobs:

- name: Setup msbuild
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v1.1
uses: microsoft/setup-msbuild@v2

# TODO(jfarebro): 02/16/2023 - There's a bug where pkg-config isn't installed on the macOS
# runner. See: https://github.com/actions/runner-images/pull/7125
Expand All @@ -44,9 +44,9 @@ jobs:

- name: Setup vcpkg
if: runner.os == 'macOS' || runner.os == 'Windows'
uses: lukka/run-vcpkg@v10
uses: lukka/run-vcpkg@v11
with:
vcpkgGitCommitId: "9aa0d66373ce3a6868d12353d0d4960db0d4bd18"
vcpkgGitCommitId: "5b1214315250939257ef5d62ecdcbca18cf4fb1c"
# There's a permissions issue with the cache
# https://github.com/microsoft/vcpkg/issues/20121
doNotCache: true
Expand Down

0 comments on commit b352210

Please sign in to comment.