Skip to content

Commit 6f39dc6

Browse files
Ci fix (#2)
1 parent 4e4ebe3 commit 6f39dc6

3 files changed

Lines changed: 37 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build
22

33
on:
44
push:
5+
branches:
6+
- main
57
pull_request:
6-
schedule:
7-
- cron: "0 0 * * *"
88

99
permissions:
1010
contents: read
@@ -29,12 +29,39 @@ jobs:
2929
with:
3030
python-version: 3.12
3131

32-
- name: Setup Zephyr project
33-
uses: zephyrproject-rtos/action-zephyr-setup@v1
34-
with:
35-
app-path: OpenAstroFocuser
36-
toolchains: arm-zephyr-eabi:xtensa-espressif_esp32s3_zephyr-elf
37-
ccache-cache-key: ${{ matrix.os }}
32+
- name: Install system dependencies
33+
shell: bash
34+
run: |
35+
if [ "${{ runner.os }}" = "Linux" ]; then
36+
sudo rm -f /var/lib/man-db/auto-update
37+
sudo apt-get update -y
38+
sudo apt-get install -y ninja-build ccache gperf
39+
if [ "${{ runner.arch }}" = "X64" ]; then
40+
sudo apt-get install -y libc6-dev-i386 g++-multilib
41+
fi
42+
elif [ "${{ runner.os }}" = "macOS" ]; then
43+
brew install ninja ccache qemu dtc gperf
44+
elif [ "${{ runner.os }}" = "Windows" ]; then
45+
choco feature enable -n allowGlobalConfirmation
46+
choco install ninja wget gperf
47+
fi
48+
49+
- name: Install west
50+
run: |
51+
pip install west
52+
53+
- name: Initialize Zephyr workspace
54+
run: |
55+
west init -l OpenAstroFocuser
56+
west update
57+
58+
- name: Install pip dependencies
59+
run: |
60+
west packages pip --install --ignore-venv-check || pip3 install -r zephyr/scripts/requirements.txt
61+
62+
- name: Install Zephyr SDK
63+
run: |
64+
west sdk install -t arm-zephyr-eabi xtensa-espressif_esp32s3_zephyr-elf
3865
3966
- name: Build firmware
4067
working-directory: OpenAstroFocuser

app/prj.conf

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
# Enable C++ support and the standard library used by the Moonlite protocol stack.
55
CONFIG_CPP=y
66
CONFIG_STD_CPP20=y
7-
CONFIG_REQUIRES_FULL_LIBCPP=y
8-
CONFIG_NEWLIB_LIBC=y
7+
CONFIG_GLIBCXX_LIBCPP=y
98
CONFIG_MOONLITE=y
109

1110
# Provide heap storage for std::string and other dynamic allocations.

lib/moonlite/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# unit so the include path is propagated when CONFIG_MOONLITE is enabled.
55
zephyr_library()
66
zephyr_library_sources(Moonlite.cpp)
7-
zephyr_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
7+
zephyr_include_directories(include)

0 commit comments

Comments
 (0)