ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 15:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 3745.remove-vestigial-tox-whitelists

Browse Source
This commit is contained in:
Sajith Sasidharan 2021-07-05 10:41:36 -04:00
commit 6f7437ea8f
No known key found for this signature in database
GPG Key ID: 0C6DA6A29D5F02BA
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.github/workflows/ci.yml vendored
View File

@ -189,10 +189,21 @@ jobs:
if: matrix.os == 'ubuntu-latest' if: matrix.os == 'ubuntu-latest'
run: sudo apt install tor run: sudo apt install tor
- name: Install Tor [macOS] - name: Install Tor [macOS, ${{ matrix.python-version }} ]
if: matrix.os == 'macos-latest' if: ${{ ( matrix.os == 'macos-latest' ) && ( matrix.python-version != '2.7' ) }}
run: brew install tor run: brew install tor
# TODO: See https://tahoe-lafs.org/trac/tahoe-lafs/ticket/3744.
# We have to use an older version of Tor for running integration
# tests on macOS using Python 2.7. We should stop doing this
# when Python 2.7 is dropped.
- name: Install Tor [macOS, ${{ matrix.python-version }} ]
if: ${{ ( matrix.os == 'macos-latest' ) && ( matrix.python-version == '2.7' ) }}
run: |
brew extract --version 0.4.5.8 tor homebrew/cask
brew install tor@0.4.5.8
brew link --overwrite tor@0.4.5.8
- name: Install Tor [Windows] - name: Install Tor [Windows]
if: matrix.os == 'windows-latest' if: matrix.os == 'windows-latest'
uses: crazy-max/ghaction-chocolatey@v1 uses: crazy-max/ghaction-chocolatey@v1

0
newsfragments/3744.minor Normal file
View File