!ci test

Author: laurensvalk

.github/workflows/build.yml

@@ -49,104 +49,15 @@ jobs:
         name: mpy-cross
         path: micropython/mpy-cross/build/mpy-cross
 
-  unix_coverage:
-    name: unix coverage
-    needs: mpy_cross
-    runs-on: ubuntu-24.04
-    env:
-      PYBRICKS_NO_REDIRECT_STDOUT: 1
-    steps:
-    - name: Checkout repo
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-    - name: Download mpy-cross
-      uses: actions/download-artifact@v4
-      with:
-        name: mpy-cross
-        path: micropython/mpy-cross/build
-    - name: Fix file permission
-      run: chmod +x micropython/mpy-cross/build/mpy-cross
-    - name: Build
-      run: |
-        cd micropython
-        make ${MAKEOPTS} -C ports/unix VARIANT=coverage submodules
-        make ${MAKEOPTS} -C ports/unix VARIANT=coverage deplibs
-        make ${MAKEOPTS} -C ports/unix VARIANT=coverage
-    - name: Test
-      if: ${{ success() }}
-      run: |
-        ulimit -n 1024 # needed for micropython/tests/extmod/select_poll_fd.py
-        cd micropython
-        make -C ports/unix VARIANT=coverage test_full
-        (cd tests && MICROPY_CPYTHON3=python3 MICROPY_MICROPYTHON=../ports/unix/build-coverage/micropython ./run-multitests.py multi_net/*.py)
-    - name: List failed tests
-      if: failure()
-      run: micropython/tests/run-tests.py --print-failures
-
-  firmware:
-    name: firmware
-    strategy:
-      fail-fast: false
-      matrix:
-        hub: [cityhub, essentialhub, movehub, nxt, primehub, technichub, ev3]
-    needs: [mpy_cross]
-    runs-on: ubuntu-24.04
-    steps:
-    - name: Install cross-compiler
-      run: sudo apt-get update && sudo apt-get install --yes gcc-arm-none-eabi
-    - name: Checkout repo
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-        fetch-depth: 0
-    - name: Download mpy-cross
-      uses: actions/download-artifact@v4
-      with:
-        name: mpy-cross
-        path: micropython/mpy-cross/build
-    - name: Fix file permission
-      run: chmod +x micropython/mpy-cross/build/mpy-cross
-    - run: pipx install poetry
-    - run: poetry install --only=stats
-    - name: Build firmware (pull request)
-      if: ${{ github.base_ref != null }}
-      run: poetry run .github/build-each-commit.py ${{ matrix.hub }} ${{ github.sha }}
-    - name: Build firmware (non-master branch)
-      if: ${{ github.base_ref == null && github.ref != 'refs/heads/master' }}
-      env:
-        STORAGE_ACCOUNT: ${{ secrets.STORAGE_ACCOUNT }}
-        STORAGE_KEY: ${{ secrets.STORAGE_KEY }}
-        STORAGE_URL: ${{ secrets.STORAGE_URL }}
-        FIRMWARE_SIZE_TABLE: ${{ secrets.FIRMWARE_SIZE_TABLE }}
-      run: poetry run .github/build-each-commit.py ${{ matrix.hub }} ${{ github.ref_name }}
-    - name: Build firmware (master branch)
-      if: ${{ github.base_ref == null && github.ref == 'refs/heads/master' }}
-      run: |
-        export MICROPY_GIT_TAG=ci-build-${{ github.run_number }}-$(git describe --tags --dirty --always --exclude "@pybricks/*")
-        export MICROPY_GIT_HASH=$(echo ${{ github.sha }} | cut -c1-8)
-        make -C bricks/${{ matrix.hub }}
-    - name: Extract firmware.zip for upload
-      if: ${{ success()}}
-      working-directory: bricks/${{ matrix.hub }}/build
-      run: unzip firmware.zip -d upload
-    - name: Short hash
-      id: vars
-      run: echo "short_sha=$(echo ${{ github.sha }} | cut -c1-8)" >> $GITHUB_OUTPUT
-    - name: Upload firmware
-      if: ${{ success()}}
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ matrix.hub }}-firmware-build-${{ github.run_number }}-git${{ steps.vars.outputs.short_sha }}
-        path: bricks/${{ matrix.hub }}/build/upload/*
-
   virtualhub:
     name: virtual hub
     needs: [mpy_cross]
     runs-on: ubuntu-24.04
     steps:
-    - name: Install depedencies
-      run: sudo apt-get update && sudo apt-get install lcov python3-numpy --yes
+    - name: Install dependencies
+      run: sudo apt-get update && sudo apt-get install lcov python3-numpy pipx
+    - name: Install Pybricksdev
+      run: pipx install pybricksdev
     - name: Checkout repo
       uses: actions/checkout@v4
       with:
@@ -175,39 +86,8 @@ jobs:
         flag-name: virtualhub
         parallel: true
 
-  pbio:
-    name: pbio tests
-    runs-on: ubuntu-24.04
-    env:
-      PBIO_TEST_RESULTS_DIR: lib/pbio/test/results
-    steps:
-    - name: Install prerequisites
-      run: |
-        sudo apt-get update
-        sudo apt-get install --yes doxygen graphviz lcov
-    - name: Checkout repo
-      uses: actions/checkout@v4
-      with:
-        submodules: true
-    - name: Build
-      run: |
-        make $MAKEOPTS -C lib/pbio/test
-    - name: Build docs
-      run: |
-        make $MAKEOPTS -C lib/pbio/doc
-    - name: Build coverage
-      run: |
-        make $MAKEOPTS -C lib/pbio/test build-coverage/lcov.info
-    - name: Coveralls
-      uses: coverallsapp/github-action@v2
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        file: lib/pbio/test/build-coverage/lcov.info
-        flag-name: PBIO
-        parallel: true
-
   finish:
-    needs: [virtualhub, pbio]
+    needs: [virtualhub]
     runs-on: ubuntu-24.04
     steps:
       - name: Coveralls

test-virtualhub.sh

@@ -15,10 +15,11 @@ SCRIPT_DIR=$(readlink -f "$(dirname "$0")")
 BRICK_DIR="$SCRIPT_DIR/bricks/simhub"
 MP_TEST_DIR="$SCRIPT_DIR/micropython/tests"
 PB_TEST_DIR=$"$SCRIPT_DIR/tests"
-BUILD_DIR="$BRICK_DIR/build${COVERAGE:+-coverage}"
+BUILD_DIR_NAME="build${COVERAGE:+-coverage}"
+BUILD_DIR="$BRICK_DIR/$BUILD_DIR_NAME"
 PBIO_DIR="$SCRIPT_DIR/lib/pbio"
 
-make -s -j $(nproc --all) -C "$BRICK_DIR"
+make -s -j $(nproc --all) -C "$BRICK_DIR" build="$BUILD_DIR_NAME"
 
 export MICROPY_MICROPYTHON="$BUILD_DIR/firmware.elf"