ci: combine dist and test jobs

Author: Sjors

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

@@ -23,7 +23,7 @@ runs:
     - name: Run tests
       shell: bash
       run: |
-        cd test; poetry run ./run_tests.py --${{ matrix.device }} --interface=${{ matrix.interface }} --device-only; cd ..
+        cd test; poetry run ./run_tests.py --${{ matrix.device }} --interface=${{ matrix.test.interface }} --device-only; cd ..
 
     - if: failure()
       shell: bash

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

@@ -13,19 +13,19 @@ runs:
         path: dist/
 
     - name: Install (Wheel)
-      if: matrix.script == 'Wheel'
+      if: matrix.test.script == 'Wheel'
       shell: bash
       run: |
         pip install dist/*.whl
 
     - name: Install (Sdist)
-      if: matrix.script == 'Sdist'
+      if: matrix.test.script == 'Sdist'
       shell: bash
       run: |
         pip install $(find dist -name "*.tar.gz" -a -not -name "*linux*")
 
     - name: Install (Bindist)
-      if: matrix.script == 'Bindist'
+      if: matrix.test.script == 'Bindist'
       shell: bash
       run: |
         poetry install; cd dist; tar -xvf hwi*linux*.tar.gz; cd ..
@@ -43,19 +43,19 @@ runs:
         device: ${{ matrix.device }}
 
     - name: Run tests (Wheel)
-      if: matrix.script == 'Wheel'
+      if: matrix.test.script == 'Wheel'
       shell: bash
       run: |
         cd test; ./run_tests.py $DEVICE --interface=cli --device-only; cd ..
 
     - name: Run tests (Sdist)
-      if: matrix.script == 'Sdist'
+      if: matrix.test.script == 'Sdist'
       shell: bash
       run: |
         cd test; ./run_tests.py $DEVICE --interface=cli --device-only; cd ..
 
     - name: Run tests (Bindist)
-      if: matrix.script == 'Bindist'
+      if: matrix.test.script == 'Bindist'
       shell: bash
       run: |
         cd test; poetry run ./run_tests.py $DEVICE --interface=bindist --device-only; cd ..

.github/workflows/ci.yml

@@ -272,35 +272,6 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/build-bitcoind
 
-  test-trezor-dist:
-    name: Python ${{ matrix.python-version }} ${{ matrix.device }} ${{ matrix.script }}
-    runs-on: ubuntu-latest
-    needs:
-      - dist-builder
-      - sim-builder-trezor
-      - bitcoind-builder
-
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: [ '3.9', '3.10', '3.11', '3.12' ]
-        device:
-          - 'trezor-1'
-          - 'trezor-t'
-        script:
-          - 'Wheel'
-          - 'Sdist'
-          - 'Bindist'
-
-    env:
-      DEVICE: '--${{ matrix.device }}'
-
-    container: python:${{ matrix.python-version }}
-
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ./.github/actions/test-dist
-
   test-coldcard-dist:
     name: Python ${{ matrix.python-version }} ${{ matrix.device }} ${{ matrix.script.name }}
     runs-on: ubuntu-latest
@@ -444,9 +415,9 @@ jobs:
       - uses: ./.github/actions/test-dist
 
   test-trezor:
-    name: Python ${{ matrix.python-version }} ${{ matrix.device }} ${{ matrix.interface }}
+    name: Python ${{ matrix.python-version }} ${{ matrix.device }} ${{ matrix.test }}
     runs-on: ubuntu-latest
-    needs: [ sim-builder-trezor, bitcoind-builder ]
+    needs: [ sim-builder-trezor, bitcoind-builder, dist-builder ]
     timeout-minutes: 45
 
     strategy:
@@ -456,13 +427,24 @@ jobs:
         device:
           - 'trezor-1'
           - 'trezor-t'
-        interface: [ 'library', 'cli', 'stdin' ]
+        test:
+          - {interface: 'library'}
+          - {interface: 'cli'}
+          - {interface: 'stdin'}
+          - {script: 'Wheel'}
+          - {script: 'Sdist'}
+          - {script: 'Bindist'}
 
     container: python:${{ matrix.python-version }}
 
     steps:
       - uses: actions/checkout@v4
-      - uses: ./.github/actions/test-device
+      - name: run test
+        if: ${{ matrix.test.interface }}
+        uses: ./.github/actions/test-device
+      - name: run dist test
+        if: ${{ matrix.test.script }}
+        uses: ./.github/actions/test-dist
 
   test-ledger:
     name: Python ${{ matrix.python-version }} ${{ matrix.device }} ${{ matrix.interface }}