Skip to content

Commit fe19534

Browse files
author
Andrew J Westlake
committed
Updated MSRV, excluded some x86 PyPy builds
1 parent 046a4d2 commit fe19534

File tree

2 files changed

+147
-137
lines changed

2 files changed

+147
-137
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,36 @@ jobs:
8181
rust-target: "i686-pc-windows-msvc",
8282
},
8383
]
84+
exclude:
85+
# PyPy doesn't release 32-bit Windows builds any more
86+
- python-version: pypy-3.7
87+
platform: { os: "windows-latest", python-architecture: "x86" }
88+
- python-version: pypy-3.8
89+
platform: { os: "windows-latest", python-architecture: "x86" }
90+
- python-version: pypy-3.9
91+
platform: { os: "windows-latest", python-architecture: "x86" }
8492
include:
85-
# Test minimal supported Rust version (no async-std)
86-
- rust: 1.45.0
87-
python-version: 3.9
93+
# Test minimal supported Rust version
94+
- rust: 1.48.0
95+
python-version: "3.10"
8896
platform:
8997
{
9098
os: "ubuntu-latest",
9199
python-architecture: "x64",
92100
rust-target: "x86_64-unknown-linux-gnu",
93101
}
94102
msrv: "MSRV"
95-
# Test minimal supported Rust version (with async-std)
96-
- rust: 1.46.0
97-
python-version: 3.9
103+
104+
# Test the `nightly` feature
105+
- rust: nightly
106+
python-version: "3.10"
98107
platform:
99108
{
100109
os: "ubuntu-latest",
101110
python-architecture: "x64",
102111
rust-target: "x86_64-unknown-linux-gnu",
103112
}
104-
msrv: "MSRV"
113+
extra_features: "nightly"
105114

106115
steps:
107116
- uses: actions/checkout@v2
@@ -127,16 +136,6 @@ jobs:
127136
- name: Build (no features)
128137
run: cargo build --no-default-features --verbose --target ${{ matrix.platform.rust-target }}
129138

130-
# Omit async-std-runtime and testing features from MSRV 1.45.0 (See README for details)
131-
- if: matrix.rust == '1.45.0'
132-
name: Prepare 1.45.0 features
133-
run: echo features=attributes,tokio-runtime >> $GITHUB_ENV
134-
135-
# Use all features for MSRV 1.46.0 and above
136-
- if: matrix.rust != '1.45.0'
137-
name: Prepare all features
138-
run: echo features=testing,attributes,tokio-runtime,async-std-runtime >> $GITHUB_ENV
139-
140139
- name: Build
141140
run: cargo build --features=${{env.features}} --verbose --target ${{ matrix.platform.rust-target }}
142141

@@ -145,10 +144,6 @@ jobs:
145144
run: |
146145
python -m pip install -U uvloop
147146
148-
# Run tests (except on PyPy, because no embedding API).
149-
- if: matrix.python-version != 'pypy-3.6'
150-
name: Test
151-
run: cargo test --features=${{env.features}} --target ${{ matrix.platform.rust-target }}
152147
env:
153148
RUST_BACKTRACE: 1
154149
RUSTFLAGS: "-D warnings"

0 commit comments

Comments
 (0)