Skip to content

Commit 9a648f1

Browse files
committed
Use the docker-run-action to test Aarch64 wheels in test.yml Actions workflow
1 parent 222e673 commit 9a648f1

File tree

2 files changed

+14
-22
lines changed

2 files changed

+14
-22
lines changed

.github/workflows/publish.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ jobs:
1616
python-version: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39]
1717
env:
1818
pyo3-python: /opt/python/${{ matrix.python-version }}/bin/python
19-
#- python-version: pypy-3.6
20-
# pyo3-python: /opt/pypy/pypy3.6-7.3.3/bin/python
21-
#- python-version: pypy-3.7
22-
# pyo3-python: /opt/pypy/pypy3.7-7.3.4/bin/python
2319
steps:
2420
- name: Checkout code
2521
uses: actions/checkout@v1

.github/workflows/test.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,34 +55,30 @@ jobs:
5555
name: "Test (Linux, Aarch64)"
5656
strategy:
5757
matrix:
58-
pyver: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39]
58+
python-version: [cp36-cp36m, cp37-cp37m, cp38-cp38, cp39-cp39]
5959
fail-fast: false
6060
runs-on: ubuntu-latest
6161
env:
62-
py: /opt/python/${{ matrix.pyver }}/bin/python
62+
pyo3-python: /opt/python/${{ matrix.python-version }}/bin/python
6363
img: quay.io/pypa/manylinux2014_aarch64
6464
steps:
65-
- name: Checkout
65+
- name: Checkout code
6666
uses: actions/checkout@v2
6767
- name: Set up QEMU
6868
id: qemu
6969
uses: docker/setup-qemu-action@v1
70-
- name: Setup Rust stable
71-
uses: ATiltedTree/setup-rust@v1
70+
- name: Test Rust extension
71+
uses: addnab/docker-run-action@v2
7272
with:
73-
rust-version: stable
74-
- name: Test
75-
run: |
76-
docker run --rm -v ${{ github.workspace }}:/ws:rw --workdir=/ws \
77-
${{ env.img }} \
78-
bash -exc '${{ env.py }} -m venv .env && \
79-
source .env/bin/activate && \
80-
python -m pip install -U -r ci/requirements.txt && \
81-
python setup.py build_ext --inplace --debug && \
82-
if \[ ${{ matrix.pyver }} != cp36-cp36m \] ; then
83-
python -m unittest discover -vv
84-
fi && \
85-
deactivate'
73+
image: ${{ env.img }}
74+
options: --rm -v ${{ github.workspace }}:/io:rw --workdir=/io
75+
shell: bash
76+
run: |
77+
${{ env.py }} -m venv .env
78+
source .env/bin/activate
79+
${{ env.pyo3-python }} -m pip install -U -r ci/requirements.txt
80+
${{ env.pyo3-python }} setup.py build_ext --inplace --debug
81+
${{ env.pyo3-python }} python -m unittest discover -vv
8682
8783
test_osx:
8884
name: Test (OSX)

0 commit comments

Comments
 (0)