Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Get CI back to green #822

Merged
merged 1 commit into from
May 17, 2024
Merged

Get CI back to green #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
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-latest
name: "Python ${{ matrix.PYTHON.VERSION }}${{ matrix.PYTHON.NOTE }} on ${{ matrix.RUNNER }}"
steps:
- uses: actions/checkout@v3.6.0
- name: Setup python
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/wheel-builder.yml
View file
Open in desktop
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/checkout@v3.6.0
with:
# The tag to build or the tag received by the tag event
Expand Down Expand Up @@ -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:
Expand Down
Loading