Skip to content

Commit

Permalink
Get CI back to green
Browse files Browse the repository at this point in the history
  • Loading branch information
alex committed May 17, 2024
1 parent 2911447 commit c11fdbf
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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-13
name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on ${{ matrix.RUNNER }}"
steps:
- uses: actions/[email protected]
- name: Setup python
Expand Down
9 changes: 8 additions & 1 deletion .github/workflows/wheel-builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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/[email protected]
with:
# The tag to build or the tag received by the tag event
Expand Down

0 comments on commit c11fdbf

Please sign in to comment.