Skip to content

Commit

Permalink
try build zephyr with ci
Browse files Browse the repository at this point in the history
  • Loading branch information
hathach committed Jan 24, 2025
1 parent 9f45e25 commit 201b970
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 11 deletions.
27 changes: 24 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
toolchain:
# - 'arm-clang' is built by circle-ci in PR
- 'aarch64-gcc'
- 'arm-gcc'
# - 'arm-gcc'
- 'msp430-gcc'
- 'riscv-gcc'
with:
Expand All @@ -72,7 +72,7 @@ jobs:
# Build Make (built by circle-ci in PR, only build on push here)
# ---------------------------------------
make:
if: github.event_name == 'push'
if: github.event_name == 'push' && false
needs: set-matrix
uses: ./.github/workflows/build_util.yml
strategy:
Expand Down Expand Up @@ -113,7 +113,7 @@ jobs:
# Build IAR on HFP self-hosted
# ---------------------------------------
arm-iar:
if: github.repository_owner == 'hathach' && github.event_name == 'push'
if: github.repository_owner == 'hathach' && github.event_name == 'push' && false
needs: set-matrix
runs-on: [self-hosted, Linux, X64, hifiphile]
env:
Expand All @@ -137,3 +137,24 @@ jobs:

- name: Build
run: python3 tools/build.py --one-per-family --toolchain iar $BUILD_ARGS

# ---------------------------------------
# Zephyr
# ---------------------------------------
zephyr:
if: github.event_name == 'push'
runs-on: ubuntu-latest
steps:
- name: Checkout TinyUSB
uses: actions/checkout@v4

- name: Setup Zephyr project
uses: zephyrproject-rtos/action-zephyr-setup@v1
with:
app-path: examples
toolchains: arm-zephyr-eabi

- name: Build
run: |
west build -b pca10056 examples/device/cdc_msc
west build -b pca10056 examples/device/msc_dual_lun
6 changes: 0 additions & 6 deletions .west/config

This file was deleted.

2 changes: 1 addition & 1 deletion examples/west.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ manifest:
- name: zephyr
remote: zephyrproject-rtos
revision: main
path: lib/zephyr
path: zephyr
import: true
self:
path: .
2 changes: 1 addition & 1 deletion hw/bsp/family_support.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ endif()

if (BUILD_ZEPHYR)
set(BOARD_ROOT ${TOP}/hw/bsp/${FAMILY})
find_package(Zephyr REQUIRED HINTS ${TOP}/lib/zephyr)
find_package(Zephyr REQUIRED HINTS ${TOP}/zephyr)
endif ()

#-------------------------------------------------------------
Expand Down

0 comments on commit 201b970

Please sign in to comment.