Skip to content

Commit b5a9985

Browse files
committed
ci: combine dist and test jobs
Also fixes indentation.
1 parent 3bad597 commit b5a9985

File tree

3 files changed

+120
-225
lines changed

3 files changed

+120
-225
lines changed

.github/actions/test-device/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ runs:
2323
- name: Run tests
2424
shell: bash
2525
run: |
26-
cd test; poetry run ./run_tests.py --${{ matrix.device }} --interface=${{ matrix.interface }} --device-only; cd ..
26+
cd test; poetry run ./run_tests.py --${{ matrix.device }} --interface=${{ matrix.test.interface }} --device-only; cd ..
2727
2828
- if: failure()
2929
shell: bash

.github/actions/test-dist/action.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,19 @@ runs:
1313
path: dist/
1414

1515
- name: Install (Wheel)
16-
if: matrix.script == 'Wheel'
16+
if: matrix.test.script == 'Wheel'
1717
shell: bash
1818
run: |
1919
pip install dist/*.whl
2020
2121
- name: Install (Sdist)
22-
if: matrix.script == 'Sdist'
22+
if: matrix.test.script == 'Sdist'
2323
shell: bash
2424
run: |
2525
pip install $(find dist -name "*.tar.gz" -a -not -name "*linux*")
2626
2727
- name: Install (Bindist)
28-
if: matrix.script == 'Bindist'
28+
if: matrix.test.script == 'Bindist'
2929
shell: bash
3030
run: |
3131
poetry install; cd dist; tar -xvf hwi*linux*.tar.gz; cd ..
@@ -43,19 +43,19 @@ runs:
4343
device: ${{ matrix.device }}
4444

4545
- name: Run tests (Wheel)
46-
if: matrix.script == 'Wheel'
46+
if: matrix.test.script == 'Wheel'
4747
shell: bash
4848
run: |
4949
cd test; ./run_tests.py $DEVICE --interface=cli --device-only; cd ..
5050
5151
- name: Run tests (Sdist)
52-
if: matrix.script == 'Sdist'
52+
if: matrix.test.script == 'Sdist'
5353
shell: bash
5454
run: |
5555
cd test; ./run_tests.py $DEVICE --interface=cli --device-only; cd ..
5656
5757
- name: Run tests (Bindist)
58-
if: matrix.script == 'Bindist'
58+
if: matrix.test.script == 'Bindist'
5959
shell: bash
6060
run: |
6161
cd test; poetry run ./run_tests.py $DEVICE --interface=bindist --device-only; cd ..

0 commit comments

Comments
 (0)