From 5bc34a2a2b18aca134dce2c75e623dc50a4c7861 Mon Sep 17 00:00:00 2001
From: Tom <tomfleet2018@gmail.com>
Date: Mon, 2 May 2022 13:35:52 +0100
Subject: [PATCH 1/2] Use latest GHA runners and add macOS

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 20ec1a79..cd57f91c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,7 +8,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2019]
+        os: [ubuntu-latest, windows-latest, macos-latest]
         python-version: ["3.7", "3.8", "3.9", "3.10"]
     steps:
       - uses: actions/checkout@v2
@@ -27,7 +27,7 @@ jobs:
       - name: Run tests on ${{ matrix.os }}
         run: nox --non-interactive --error-on-missing-interpreter --session "tests-${{ matrix.python-version }}" -- --full-trace
   lint:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.9
@@ -40,7 +40,7 @@ jobs:
       - name: Lint
         run: nox --non-interactive --error-on-missing-interpreter --session "lint"
   docs:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Set up Python 3.9
@@ -54,7 +54,7 @@ jobs:
         run: nox --non-interactive --error-on-missing-interpreter --session "docs"
   deploy:
     needs: build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
     steps:
       - uses: actions/checkout@v2

From 93de2dfce5bbb32543584a59051e3a5a70653862 Mon Sep 17 00:00:00 2001
From: Tom <tomfleet2018@gmail.com>
Date: Mon, 2 May 2022 13:47:21 +0100
Subject: [PATCH 2/2] Fix test failure on Windows with reusing python 2 env

---
 tests/test_virtualenv.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/test_virtualenv.py b/tests/test_virtualenv.py
index ce5dd232..6070becf 100644
--- a/tests/test_virtualenv.py
+++ b/tests/test_virtualenv.py
@@ -502,6 +502,7 @@ def test_create_reuse_oldstyle_virtualenv_environment(make_one):
 
 
 @enable_staleness_check
+@pytest.mark.skipif(IS_WINDOWS, reason="Avoid spurious failure on Windows.")
 def test_create_reuse_python2_environment(make_one):
     venv, location = make_one(reuse_existing=True, interpreter="2.7")