diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b7d3847..1c360c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,34 +7,23 @@ on: [push, pull_request] jobs: build: - runs-on: ubuntu-latest - container: teslabs/spinner:latest - env: - CMAKE_PREFIX_PATH: /opt/toolchains + runs-on: ubuntu-22.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: path: spinner - - name: Cache Zephyr - uses: actions/cache@v3 + - name: Set up Python + uses: actions/setup-python@v4 with: - path: | - modules - zephyr - key: ${{ hashFiles('spinner/west.yml') }} + python-version: 3.11 - - name: Initialize - working-directory: spinner - run: | - pip3 install -U west - west init -l . - west update - pip3 install -r ../zephyr/scripts/requirements-base.txt - pip3 install -r ../zephyr/scripts/requirements-build-test.txt - pip3 install -r ../zephyr/scripts/requirements-run-test.txt - pip3 install -r docs/requirements.txt + - name: Setup Zephyr project + uses: zephyrproject-rtos/action-zephyr-setup@v1 + with: + app-path: spinner + toolchains: arm-zephyr-eabi - name: Lint code run: | @@ -51,4 +40,4 @@ jobs: - name: Test working-directory: spinner run: | - west twister -T tests --integration -v + west twister -T tests -v --inline-logs --integration diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 0df07a0..0000000 --- a/Dockerfile +++ /dev/null @@ -1,39 +0,0 @@ -FROM ubuntu:22.04 - -# install dependencies -ARG DEBIAN_FRONTEND=noninteractive - -RUN apt-get update && apt-get install -y --no-install-recommends \ - git \ - cmake \ - ninja-build \ - gperf \ - ccache \ - dfu-util \ - device-tree-compiler \ - wget \ - python3-dev \ - python3-pip \ - python3-setuptools \ - python3-tk \ - python3-wheel \ - xz-utils \ - file \ - make \ - gcc \ - gcc-multilib \ - g++-multilib \ - libsdl2-dev \ - libmagic1 \ - doxygen \ - && rm -rf /var/lib/apt/lists/* - -# install SDK -ARG ZSDK_VERSION=0.16.4 -RUN mkdir /opt/toolchains && cd /opt/toolchains && \ - wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZSDK_VERSION}/zephyr-sdk-${ZSDK_VERSION}_linux-x86_64_minimal.tar.xz" && \ - tar xf zephyr-sdk-${ZSDK_VERSION}_linux-x86_64_minimal.tar.xz -C . && \ - ./zephyr-sdk-${ZSDK_VERSION}/setup.sh -t arm-zephyr-eabi -c - -# install West -RUN pip3 install west