Merge pull request #1137 from tahoe-lafs/3810-unbreak-macos-github-actions

Pin macOS 10.15 on GitHub Actions for Python 2.7 support

Fixes: ticket:3810
This commit is contained in:
Jean-Paul Calderone 2021-10-06 13:51:04 -04:00 committed by GitHub
commit d4b4850afb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -28,7 +28,7 @@ jobs:
- 3.9 - 3.9
include: include:
# On macOS don't bother with 3.6-3.8, just to get faster builds. # On macOS don't bother with 3.6-3.8, just to get faster builds.
- os: macos-latest - os: macos-10.15
python-version: 2.7 python-version: 2.7
- os: macos-latest - os: macos-latest
python-version: 3.9 python-version: 3.9
@ -168,7 +168,7 @@ jobs:
- 3.9 - 3.9
include: include:
# On macOS don't bother with 3.6, just to get faster builds. # On macOS don't bother with 3.6, just to get faster builds.
- os: macos-latest - os: macos-10.15
python-version: 2.7 python-version: 2.7
- os: macos-latest - os: macos-latest
python-version: 3.9 python-version: 3.9
@ -183,7 +183,7 @@ jobs:
# We have to use an older version of Tor for running integration # We have to use an older version of Tor for running integration
# tests on macOS. # tests on macOS.
- name: Install Tor [macOS, ${{ matrix.python-version }} ] - name: Install Tor [macOS, ${{ matrix.python-version }} ]
if: ${{ matrix.os == 'macos-latest' }} if: ${{ contains(matrix.os, 'macos') }}
run: | run: |
brew extract --version 0.4.5.8 tor homebrew/cask brew extract --version 0.4.5.8 tor homebrew/cask
brew install tor@0.4.5.8 brew install tor@0.4.5.8
@ -247,7 +247,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
os: os:
- macos-latest - macos-10.15
- windows-latest - windows-latest
- ubuntu-latest - ubuntu-latest
python-version: python-version:

0
newsfragments/3810.minor Normal file
View File