From b28b66cab3ef639ece0b48d9219b9256fc8a01d9 Mon Sep 17 00:00:00 2001 From: Gareth Potter Date: Mon, 10 Nov 2025 15:40:54 +0000 Subject: [PATCH 1/4] try using Zephyr GitHub action for CI --- .github/workflows/build.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac6e3e1..7cb9207 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,9 +5,8 @@ on: [push, pull_request] jobs: build: runs-on: ubuntu-latest - container: zephyrprojectrtos/ci:latest - env: - CMAKE_PREFIX_PATH: /opt/toolchains + # env: + # CMAKE_PREFIX_PATH: /opt/toolchains steps: - name: Checkout uses: actions/checkout@v3 @@ -15,16 +14,22 @@ jobs: path: thingset-node-c fetch-depth: 0 # necessary to get tags + - name: Setup Zephyr project + uses: zephyrproject-rtos/action-zephyr-setup@v1 + with: + app-path: thingset-node-c + # toolchains: x86_64-zephyr-elf + - name: Trailing whitespace check working-directory: thingset-node-c run: | git diff --check `git rev-list HEAD | tail -n 1`.. - - name: Initialize west workspace - working-directory: thingset-node-c - run: | - west init -l . - west update + # - name: Initialize west workspace + # working-directory: thingset-node-c + # run: | + # west init -l . + # west update - name: Install docs dependencies working-directory: thingset-node-c From bce214511cae09d0745be3f4b662609d7afcc0f0 Mon Sep 17 00:00:00 2001 From: Gareth Potter Date: Mon, 10 Nov 2025 15:44:32 +0000 Subject: [PATCH 2/4] elevate --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7cb9207..0c71818 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,8 +45,8 @@ jobs: - name: Generate coverage report working-directory: thingset-node-c run: | - apt-get update - apt-get install lcov + sudo apt-get update + sudo apt-get install lcov west build -b native_posix tests/protocol -t run lcov --capture --directory build/modules/thingset-node-c --output-file build/lcov.info --rc lcov_branch_coverage=1 --exclude '*zephyr*' --exclude '*lib*' genhtml build/lcov.info --output-directory build/lcov_html --ignore-errors source --branch-coverage --highlight --legend From 94737bd127be4f36ef9a897f180cae79f02dd862 Mon Sep 17 00:00:00 2001 From: Gareth Potter Date: Mon, 10 Nov 2025 15:47:40 +0000 Subject: [PATCH 3/4] tidy prerequisite install --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c71818..30feb47 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,7 +34,8 @@ jobs: - name: Install docs dependencies working-directory: thingset-node-c run: | - sudo apt install -y git make python3 python3-pip doxygen + sudo apt-get update + sudo apt-get install -y doxygen lcov pip3 install -r docs/requirements.txt - name: Run unit tests @@ -45,8 +46,6 @@ jobs: - name: Generate coverage report working-directory: thingset-node-c run: | - sudo apt-get update - sudo apt-get install lcov west build -b native_posix tests/protocol -t run lcov --capture --directory build/modules/thingset-node-c --output-file build/lcov.info --rc lcov_branch_coverage=1 --exclude '*zephyr*' --exclude '*lib*' genhtml build/lcov.info --output-directory build/lcov_html --ignore-errors source --branch-coverage --highlight --legend From eee4dc6b2006c52089eb12b06d788259dba17d77 Mon Sep 17 00:00:00 2001 From: Gareth Potter Date: Mon, 10 Nov 2025 15:48:40 +0000 Subject: [PATCH 4/4] remove commented-out bits --- .github/workflows/build.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 30feb47..6da481a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,8 +5,6 @@ on: [push, pull_request] jobs: build: runs-on: ubuntu-latest - # env: - # CMAKE_PREFIX_PATH: /opt/toolchains steps: - name: Checkout uses: actions/checkout@v3 @@ -18,19 +16,12 @@ jobs: uses: zephyrproject-rtos/action-zephyr-setup@v1 with: app-path: thingset-node-c - # toolchains: x86_64-zephyr-elf - name: Trailing whitespace check working-directory: thingset-node-c run: | git diff --check `git rev-list HEAD | tail -n 1`.. - # - name: Initialize west workspace - # working-directory: thingset-node-c - # run: | - # west init -l . - # west update - - name: Install docs dependencies working-directory: thingset-node-c run: |