From 4abf59ec983861d4977d761a5fbe0356a04d4ecc Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:12:21 +0200 Subject: [PATCH 1/6] ci: Use matrix build Use specific zephyr version and boards --- .github/workflows/samples_build.yml | 36 +++++++++++++++++++---------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/.github/workflows/samples_build.yml b/.github/workflows/samples_build.yml index 7d82c0d..e3c9798 100644 --- a/.github/workflows/samples_build.yml +++ b/.github/workflows/samples_build.yml @@ -1,34 +1,46 @@ -# Copyright (c) 2024, Victor Chavez +# Copyright (c) 2024-2025, Victor Chavez # SPDX-License-Identifier: GPL-3.0-or-later - -name: Build Samples +name: Build Zephyr Samples on: push: pull_request: jobs: - - read_pd: + build-read-pd: runs-on: ubuntu-22.04 - container: ghcr.io/zephyrproject-rtos/ci:v0.26.2 + container: ghcr.io/zephyrproject-rtos/ci:v0.28.2 env: CMAKE_PREFIX_PATH: /opt/toolchains + strategy: matrix: - board: ["esp32","nrf52833dk_nrf52833"] + include: + - zephyr_version: "3.7.0" + board: "esp32" + - zephyr_version: "3.7.0" + board: "nrf52833dk_nrf52833" + - zephyr_version: "4.2.0" + board: "esp32c3_devkitc" + - zephyr_version: "4.0.0" + board: "nrf52833dk" + steps: - - name: Checkout + - name: Checkout repository uses: actions/checkout@v4 with: submodules: true - - name: Initialize + + - name: Initialize Zephyr ${{ matrix.zephyr_version }} run: | cd /tmp/ - west init + west init --mr=${{ matrix.zephyr_version }} west update -o=--depth=1 -n - - name: Build + - name: Build read_pd for ${{ matrix.board }} on Zephyr ${{ matrix.zephyr_version }} working-directory: /tmp/ run: | - west build $GITHUB_WORKSPACE/samples/read_pd -b ${{ matrix.board }} --build-dir $GITHUB_WORKSPACE/build + build_dir=$GITHUB_WORKSPACE/build/${{ matrix.zephyr_version }}/${{ matrix.board }} + west build $GITHUB_WORKSPACE/samples/read_pd \ + -b ${{ matrix.board }} \ + --build-dir $build_dir From 23503f682a85d57b2d4284f3d632ee4dfd8928ab Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:16:59 +0200 Subject: [PATCH 2/6] ci: revert to container v0.26.2 --- .github/workflows/samples_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/samples_build.yml b/.github/workflows/samples_build.yml index e3c9798..d76bc64 100644 --- a/.github/workflows/samples_build.yml +++ b/.github/workflows/samples_build.yml @@ -9,7 +9,7 @@ on: jobs: build-read-pd: runs-on: ubuntu-22.04 - container: ghcr.io/zephyrproject-rtos/ci:v0.28.2 + container: ghcr.io/zephyrproject-rtos/ci:v0.26.2 env: CMAKE_PREFIX_PATH: /opt/toolchains From 2494ff6a06616f2803e5c714a52fd9ec16e57150 Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:22:45 +0200 Subject: [PATCH 3/6] ci: fix version tag --- .github/workflows/samples_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/samples_build.yml b/.github/workflows/samples_build.yml index d76bc64..c388d3c 100644 --- a/.github/workflows/samples_build.yml +++ b/.github/workflows/samples_build.yml @@ -31,10 +31,10 @@ jobs: with: submodules: true - - name: Initialize Zephyr ${{ matrix.zephyr_version }} + - name: Initialize Zephyr v${{ matrix.zephyr_version }} run: | cd /tmp/ - west init --mr=${{ matrix.zephyr_version }} + west init --mr=v${{ matrix.zephyr_version }} west update -o=--depth=1 -n - name: Build read_pd for ${{ matrix.board }} on Zephyr ${{ matrix.zephyr_version }} From f009ad8b0ea4f1e8fad6d3357372b06043774feb Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:32:00 +0200 Subject: [PATCH 4/6] ci: 4.2.0 zephyr --- .github/workflows/samples_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/samples_build.yml b/.github/workflows/samples_build.yml index c388d3c..2f08594 100644 --- a/.github/workflows/samples_build.yml +++ b/.github/workflows/samples_build.yml @@ -22,7 +22,7 @@ jobs: board: "nrf52833dk_nrf52833" - zephyr_version: "4.2.0" board: "esp32c3_devkitc" - - zephyr_version: "4.0.0" + - zephyr_version: "4.2.0" board: "nrf52833dk" steps: From 1a154ecc69310afb41887bbcac11a6c0922d3414 Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:37:02 +0200 Subject: [PATCH 5/6] Update samples_build.yml --- .github/workflows/samples_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/samples_build.yml b/.github/workflows/samples_build.yml index 2f08594..1b64813 100644 --- a/.github/workflows/samples_build.yml +++ b/.github/workflows/samples_build.yml @@ -23,7 +23,7 @@ jobs: - zephyr_version: "4.2.0" board: "esp32c3_devkitc" - zephyr_version: "4.2.0" - board: "nrf52833dk" + board: "nrf52833dk/nrf52833" steps: - name: Checkout repository From e43ee7b8543c6328b30670fcc49d0ba64706834c Mon Sep 17 00:00:00 2001 From: Victor Chavez <47216966+vChavezB@users.noreply.github.com> Date: Sun, 27 Jul 2025 15:49:07 +0200 Subject: [PATCH 6/6] fix array init with DT_INST_FOR_EACH_STATUS_OKAY comma removed --- src/transciever.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/transciever.c b/src/transciever.c index a1d32af..d6ff8c8 100644 --- a/src/transciever.c +++ b/src/transciever.c @@ -137,7 +137,7 @@ DT_INST_FOREACH_STATUS_OKAY(MAXIM14819_DEFINE) static const struct device *maxim14819_devices[] = { - DT_INST_FOREACH_STATUS_OKAY(DEVICE_DT_INST_GET), + DT_INST_FOREACH_STATUS_OKAY(DEVICE_DT_INST_GET) }; iolink_hw_drv_t * get_drv(uint8_t port){