Skip to content

Commit b1173f5

Browse files
committed
ci: fix more ubuntu-24.04 failures (#4610)
* ci: fix more ubuntu-24.04 failures * use 22.04 to test 3.7 * disable zoneinfo test on free-threading
1 parent 7371028 commit b1173f5

File tree

1 file changed

+18
-0
lines changed

1 file changed

+18
-0
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,15 @@ jobs:
314314
python-architecture: "x64",
315315
rust-target: "x86_64-apple-darwin",
316316
}
317+
# ubuntu-latest (24.04) no longer supports 3.7, so run on 22.04
318+
- rust: stable
319+
python-version: "3.7"
320+
platform:
321+
{
322+
os: "ubuntu-22.04",
323+
python-architecture: "x64",
324+
rust-target: "x86_64-unknown-linux-gnu",
325+
}
317326

318327
# arm64 macOS Python not available on GitHub Actions until 3.10
319328
# so backfill 3.7-3.9 with x64 macOS runners
@@ -343,6 +352,9 @@ jobs:
343352
}
344353

345354
exclude:
355+
# ubuntu-latest (24.04) no longer supports 3.7
356+
- python-version: "3.7"
357+
platform: { os: "ubuntu-latest" }
346358
# arm64 macOS Python not available on GitHub Actions until 3.10
347359
- rust: stable
348360
python-version: "3.7"
@@ -557,6 +569,9 @@ jobs:
557569
runs-on: ubuntu-latest
558570
steps:
559571
- uses: actions/checkout@v4
572+
- uses: actions/setup-python@v5
573+
with:
574+
python-version: '3.12'
560575
- uses: Swatinem/rust-cache@v2
561576
with:
562577
save-if: ${{ github.event_name != 'merge_group' }}
@@ -626,6 +641,9 @@ jobs:
626641
target: "x86_64-apple-darwin"
627642
steps:
628643
- uses: actions/checkout@v4
644+
- uses: actions/setup-python@v5
645+
with:
646+
python-version: '3.12'
629647
- uses: Swatinem/rust-cache@v2
630648
with:
631649
workspaces:

0 commit comments

Comments
 (0)