Skip to content

Commit d525af9

Browse files
authored
ci: fix msrv job (#13)
* ci: fix msrv job * ci: bump jobs to use 3.13 by default * use tomllib * just use `cargo add` to set MSRV versions
1 parent d5bdc3f commit d525af9

File tree

1 file changed

+11
-18
lines changed

1 file changed

+11
-18
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@v4
1919
- uses: actions/setup-python@v5
2020
with:
21-
python-version: "3.10"
21+
python-version: "3.13"
2222
- run: pip install black==24.10.0
2323
- uses: dtolnay/rust-toolchain@stable
2424
with:
@@ -47,15 +47,7 @@ jobs:
4747
fail-fast: false # If one platform fails, allow the rest to keep testing.
4848
matrix:
4949
rust: [stable]
50-
python-version:
51-
[
52-
"3.9",
53-
"3.10",
54-
"3.11",
55-
"3.12",
56-
"3.13",
57-
"pypy-3.9",
58-
]
50+
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13", "pypy-3.9"]
5951
platform:
6052
[
6153
{
@@ -86,7 +78,7 @@ jobs:
8678
include:
8779
# Test minimal supported Rust version
8880
- rust: 1.63.0
89-
python-version: "3.10"
81+
python-version: "3.13"
9082
platform:
9183
{
9284
os: "ubuntu-latest",
@@ -122,27 +114,28 @@ jobs:
122114
toolchain: ${{ matrix.rust }}
123115
target: ${{ matrix.platform.rust-target }}
124116

125-
# - if: matrix.platform.os == 'ubuntu-latest'
126-
# name: Prepare LD_LIBRARY_PATH (Ubuntu only)
127-
# run: echo LD_LIBRARY_PATH=${pythonLocation}/lib >> $GIHUB_ENV
117+
- if: ${{ matrix.msrv == 'MSRV' }}
118+
name: Set MSRV dependencies
119+
run: |
120+
cargo add tokio@=1.38.1
128121
129122
- name: Build (no features)
130123
run: cargo build --no-default-features --verbose --target ${{ matrix.platform.rust-target }}
131124

132125
- name: Build
133126
run: cargo build --features=${{env.features}} --verbose --target ${{ matrix.platform.rust-target }}
134127

135-
# uvloop doesn't compile under Windows, Python 3.11-dev, and PyPy
136-
- if: ${{ matrix.platform.os != 'windows-latest' && matrix.python-version != '3.11-dev' && !startsWith(matrix.python-version, 'pypy') }}
128+
# uvloop doesn't compile under Windows and PyPy
129+
- if: ${{ matrix.platform.os != 'windows-latest' && !startsWith(matrix.python-version, 'pypy') }}
137130
name: Install pyo3-asyncio test dependencies
138131
run: |
139132
python -m pip install -U uvloop
140133
141-
- if: ${{ matrix.msrv != 'MSRV' && matrix.python-version != '3.11-dev' && !startsWith(matrix.python-version, 'pypy') }}
134+
- if: ${{ matrix.msrv != 'MSRV' && !startsWith(matrix.python-version, 'pypy') }}
142135
name: Test
143136
run: cargo test --all-features --target ${{ matrix.platform.rust-target }}
144137

145-
- if: ${{ matrix.msrv == 'MSRV' && matrix.python-version != '3.11-dev' && !startsWith(matrix.python-version, 'pypy') }}
138+
- if: ${{ matrix.msrv == 'MSRV' && !startsWith(matrix.python-version, 'pypy') }}
146139
name: Test (MSRV, --no-default-features)
147140
run: cargo test --no-default-features --features tokio-runtime,async-std-runtime,attributes,unstable-streams --target ${{ matrix.platform.rust-target }}
148141

0 commit comments

Comments
 (0)