Merge remote-tracking branch 'origin/master' into 4134.fix-circleci-nix

This commit is contained in:
Benoit Donneaux 2024-12-07 03:21:18 +01:00
commit 5d2ed92a61
2 changed files with 12 additions and 11 deletions

View File

@ -45,14 +45,14 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-12
- os: macos-14
python-version: "3.12"
# We only support PyPy on Linux at the moment.
- os: ubuntu-latest
- os: ubuntu-22.04
python-version: "pypy-3.9"
- os: ubuntu-latest
- os: ubuntu-22.04
python-version: "3.12"
- os: windows-latest
- os: windows-2022
python-version: "3.12"
steps:
@ -140,7 +140,7 @@ jobs:
finish-coverage-report:
needs:
- "coverage"
runs-on: "ubuntu-latest"
runs-on: "ubuntu-22.04"
container: "python:3-slim"
steps:
- name: "Indicate completion to coveralls.io"
@ -160,8 +160,8 @@ jobs:
# 22.04 has some issue with Tor at the moment:
# https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3943
- ubuntu-20.04
- macos-12
- windows-latest
- macos-14
- windows-2022
python-version:
- "3.11"
force-foolscap:
@ -185,7 +185,7 @@ jobs:
brew install tor
- name: Install Tor [Windows]
if: matrix.os == 'windows-latest'
if: matrix.os == 'windows-2022'
uses: crazy-max/ghaction-chocolatey@v2
with:
args: install tor
@ -242,9 +242,9 @@ jobs:
fail-fast: false
matrix:
os:
- macos-12
- windows-latest
- ubuntu-latest
- macos-14
- windows-2022
- ubuntu-22.04
python-version:
- 3.9

1
newsfragments/4141.minor Normal file
View File

@ -0,0 +1 @@
pinning base images of builders to improve reproducibility on checks for PRs