From c9b9307ff320c9bb0ecb9a951aeab0da4d9d1684 Mon Sep 17 00:00:00 2001
From: spencer <spencer.taylor-brown@ethereum.org>
Date: Thu, 25 Apr 2024 21:40:16 +0800
Subject: [PATCH] chore(ci): Revert ci to use macos-latest & ubuntu-latest.
 (#525)

---
 .github/workflows/test.yaml | 8 ++++----
 tox.ini                     | 3 +++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 1f5d721996..e7ab52f3e9 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -8,22 +8,22 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             python: '3.10'
             solc: '0.8.20'
             evm-type: 'main'
             tox-cmd: 'tox run-parallel --parallel-no-spinner'
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             python: '3.12'
             solc: '0.8.23'
             evm-type: 'main'
             tox-cmd: 'tox run-parallel --parallel-no-spinner'
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             python: '3.11'
             solc: '0.8.21'
             evm-type: 'main'  # 'develop'
             tox-cmd: 'tox run-parallel --parallel-no-spinner'  # 'tox -e tests-develop'
-          - os: macos-12
+          - os: macos-latest
             python: '3.11'
             solc: '0.8.22'
             evm-type: 'main'
diff --git a/tox.ini b/tox.ini
index c29e91130d..60b8c6ca48 100644
--- a/tox.ini
+++ b/tox.ini
@@ -75,6 +75,9 @@ extras =
 
 setenv =
     SPEC_TESTS_AUTO_GENERATE_FILES = true
+    # Required for `cairosvg` so tox can find `libcairo-2`.
+    # https://squidfunk.github.io/mkdocs-material/plugins/requirements/image-processing/?h=cairo#cairo-library-was-not-found
+    DYLD_FALLBACK_LIBRARY_PATH = /opt/homebrew/lib
 
 src = setup.py docs/gen_test_case_reference.py