From faee4ef7e7bdec316688e00971b5562c9cba8b1d Mon Sep 17 00:00:00 2001
From: Alex Gaynor <alex.gaynor@gmail.com>
Date: Fri, 17 May 2024 08:17:39 -0400
Subject: [PATCH] Get CI back to green

---
 .github/workflows/ci.yml            | 10 ++++++++--
 .github/workflows/wheel-builder.yml | 15 +++++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a79dc4d..85f9acd5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -64,14 +64,20 @@ jobs:
         if: matrix.PYTHON.COVERAGE != 'false'
 
   macos:
-    runs-on: macos-latest
+    runs-on: ${{ matrix.RUNNER }}
     strategy:
       matrix:
+        RUNNER:
+          - 'macos-13'
+          - 'macos-latest'
         PYTHON:
           - {VERSION: "3.6", TOXENV: "py36"}
           - {VERSION: "3.12", TOXENV: "py312"}
           - {VERSION: "3.12", TOXENV: "py312", NOTE: " (minimal build)", SODIUM_INSTALL_MINIMAL: "1"}
-    name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on macOS"
+        exclude:
+          - PYTHON: {VERSION: "3.6", TOXENV: "py36"}
+            RUNNER: macos-latest
+    name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on ${{ matrix.RUNNER }}"
     steps:
       - uses: actions/checkout@v3.6.0
       - name: Setup python
diff --git a/.github/workflows/wheel-builder.yml b/.github/workflows/wheel-builder.yml
index 61b09d73..3a09d802 100644
--- a/.github/workflows/wheel-builder.yml
+++ b/.github/workflows/wheel-builder.yml
@@ -20,7 +20,11 @@ on:
 jobs:
   manylinux:
     runs-on: ubuntu-latest
-    container: ghcr.io/pyca/${{ matrix.MANYLINUX.CONTAINER }}
+    container:
+      image: ghcr.io/pyca/${{ matrix.MANYLINUX.CONTAINER }}
+      volumes:
+        - /staticnodehost:/staticnodecontainer:rw,rshared
+        - /staticnodehost:/__e/node20:ro,rshared
     strategy:
       matrix:
         PYTHON:
@@ -32,6 +36,9 @@ jobs:
 
     name: "${{ matrix.PYTHON.VERSION }} for ${{ matrix.MANYLINUX.NAME }}"
     steps:
+      - name: Ridiculous-er workaround for static node20
+        run: |
+          cp -R /staticnode/* /staticnodecontainer/
       - uses: actions/checkout@v3.6.0
         with:
           # The tag to build or the tag received by the tag event
@@ -87,10 +94,10 @@ jobs:
       - run: venv/bin/pip install -U pip wheel cffi
       - name: Make sdist
         run: venv/bin/python setup.py sdist
-      - run: tar zxvf dist/PyNaCl*.tar.gz && mkdir wheelhouse
+      - run: tar zxvf dist/pynacl*.tar.gz && mkdir wheelhouse
       - name: Build the wheel
         run: |
-            cd PyNaCl*
+            cd pynacl*
             LIBSODIUM_MAKE_ARGS="-j$(sysctl -n hw.ncpu)" \
                 ../venv/bin/python setup.py bdist_wheel --py-limited-api=${{ matrix.PYTHON.ABI_VERSION }} && mv dist/PyNaCl*.whl ../wheelhouse
         env:
@@ -104,7 +111,7 @@ jobs:
           venv/bin/python -c "import nacl.signing; key = nacl.signing.SigningKey.generate();signature = key.sign(b'test'); key.verify_key.verify(signature)"
 
       - run: mkdir pynacl-wheelhouse
-      - run: mv wheelhouse/PyNaCl*.whl pynacl-wheelhouse/
+      - run: mv wheelhouse/pynacl*.whl pynacl-wheelhouse/
       - uses: actions/upload-artifact@v1
         with:
           name: "pynacl-${{ github.event.inputs.version }}-macOS-${{ matrix.PYTHON.VERSION }}"