Skip to content

Commit

Permalink
ci: fix more ubuntu-24.04 failures (#4610)
Browse files Browse the repository at this point in the history
* ci: fix more ubuntu-24.04 failures

* use 22.04 to test 3.7

* disable zoneinfo test on free-threading
  • Loading branch information
davidhewitt committed Oct 12, 2024
1 parent 7371028 commit b1173f5
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,15 @@ jobs:
python-architecture: "x64",
rust-target: "x86_64-apple-darwin",
}
# ubuntu-latest (24.04) no longer supports 3.7, so run on 22.04
- rust: stable
python-version: "3.7"
platform:
{
os: "ubuntu-22.04",
python-architecture: "x64",
rust-target: "x86_64-unknown-linux-gnu",
}

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

exclude:
# ubuntu-latest (24.04) no longer supports 3.7
- python-version: "3.7"
platform: { os: "ubuntu-latest" }
# arm64 macOS Python not available on GitHub Actions until 3.10
- rust: stable
python-version: "3.7"
Expand Down Expand Up @@ -557,6 +569,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- uses: Swatinem/rust-cache@v2
with:
save-if: ${{ github.event_name != 'merge_group' }}
Expand Down Expand Up @@ -626,6 +641,9 @@ jobs:
target: "x86_64-apple-darwin"
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.12'
- uses: Swatinem/rust-cache@v2
with:
workspaces:
Expand Down

0 comments on commit b1173f5

Please sign in to comment.