Tweak pyo3-ffi-check

This commit is contained in:
messense 2022-11-23 15:51:43 +08:00
parent a63a782eec
commit 272f7dd07f
No known key found for this signature in database
GPG Key ID: BB41A8A2C716CCA9
2 changed files with 11 additions and 16 deletions

View File

@ -133,30 +133,25 @@ jobs:
CARGO_TARGET_DIR: ${{ github.workspace }}/target
- uses: dorny/paths-filter@v2
if: ${{ inputs.rust == 'stable' && inputs.python-version != 'pypy3.7' && inputs.python-version != 'pypy3.8' }}
# pypy 3.7 and 3.8 are not PEP 3123 compliant so fail checks here
if: ${{ inputs.rust == 'stable' && inputs.python-version != 'pypy-3.7' && inputs.python-version != 'pypy-3.8' }}
id: ffi-changes
with:
filters: |
changed:
- 'pyo3-ffi/**'
- 'pyo3-ffi-check/**'
- '.github/workflows/ci.yml'
- '.github/workflows/build.yml'
- name: Checkout pyo3-ffi-check
# pypy 3.7 and 3.8 are not PEP 3123 compliant so fail checks here
if: ${{ steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && inputs.python-version != 'pypy3.7' && inputs.python-version != 'pypy3.8' }}
uses: actions/checkout@v3
with:
repository: PyO3/pyo3-ffi-check
path: pyo3-ffi-check
- run: cargo doc -p pyo3-ffi
working-directory: pyo3-ffi-check
if: ${{ steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && inputs.python-version != 'pypy3.7' && inputs.python-version != 'pypy3.8' }}
if: ${{ steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && inputs.python-version != 'pypy-3.7' && inputs.python-version != 'pypy-3.8' }}
- run: cargo run
- name: Run pyo3-ffi-check
run: cargo run
working-directory: pyo3-ffi-check
if: ${{ steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && inputs.python-version != 'pypy3.7' && inputs.python-version != 'pypy3.8' }}
if: ${{ steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && inputs.python-version != 'pypy-3.7' && inputs.python-version != 'pypy-3.8' }}
- name: Test cross compilation
if: ${{ inputs.os == 'ubuntu-latest' && inputs.python-version == '3.9' }}

View File

@ -5,10 +5,10 @@ edition = "2021"
[dependencies]
pyo3-ffi-check-macro = { path = "./macro" }
memoffset = "0.6.5"
memoffset = "0.7.0"
[dependencies.pyo3-ffi]
git = "https://github.com/pyo3/pyo3"
path = "../pyo3-ffi"
features = ["extension-module"] # A lazy way of skipping linking in most cases (as we don't use any runtime symbols)
[workspace]
@ -17,5 +17,5 @@ members = [
]
[build-dependencies]
bindgen = "0.59.2"
pyo3-build-config = { git = "https://github.com/pyo3/pyo3" }
bindgen = "0.63.0"
pyo3-build-config = { path = "../pyo3-build-config" }