Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Zephyr v3.3.0 and SDK v0.16.1 #1825

Merged
merged 13 commits into from
Jun 8, 2023
Merged

Update to Zephyr v3.3.0 and SDK v0.16.1 #1825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eccfc5c
Update CI to use Zephyr v3.3.0 and SDK v0.16.1
erlingrj Jun 7, 2023
ec70b77
Fix setup-zephyr action
erlingrj Jun 7, 2023
c990231
Set shell
erlingrj Jun 7, 2023
22be739
Try to use environment variable
erlingrj Jun 7, 2023
ccecb6d
CI
erlingrj Jun 7, 2023
b4f897d
CI
erlingrj Jun 7, 2023
53cac26
More CI
erlingrj Jun 7, 2023
3ad09d6
Go back to using GITHUB_ENV
erlingrj Jun 7, 2023
265cf02
CI
erlingrj Jun 7, 2023
f806f42
CI
erlingrj Jun 7, 2023
24f6cde
CI
erlingrj Jun 7, 2023
225293c
CI
erlingrj Jun 7, 2023
cb554b0
Merge branch 'master' into zephyr-bump-version
erlingrj Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions .github/actions/setup-zephyr/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ description: Install Zephyr and dependencies (Linux only)
runs:
using: "composite"
steps:
- name: Setup environment variables
run: |
echo "SDK_VERSION=0.16.1" >> $GITHUB_ENV
echo "ZEPHYR_VERSION=3.3.0" >> $GITHUB_ENV
shell: bash
- name: Dependencies
run: |
sudo apt-get update && sudo apt-get upgrade
Expand All @@ -16,20 +21,20 @@ runs:
shell: bash
- name: Install Zephyr SDK
run : |
wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/zephyr-sdk-0.15.2_linux-x86_64.tar.gz
wget -O - https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.15.2/sha256.sum | shasum --check --ignore-missing
sudo tar xf zephyr-sdk-0.15.2_linux-x86_64.tar.gz --directory /opt/
cd /opt/zephyr-sdk-0.15.2
wget -q "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{env.SDK_VERSION}}/zephyr-sdk-${{env.SDK_VERSION}}_linux-x86_64.tar.xz"
wget -O - "https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${{env.SDK_VERSION}}/sha256.sum" | shasum --check --ignore-missing
sudo tar xvf "zephyr-sdk-${{env.SDK_VERSION}}_linux-x86_64.tar.xz" --directory /opt/
cd "/opt/zephyr-sdk-${{env.SDK_VERSION}}"
sudo ./setup.sh -t all -h -c
shell: bash
- name: Download and install Zephyr RTOS
run: |
cd $HOME
west init zephyrproject --mr v3.2.0
west init zephyrproject --mr "v${{env.ZEPHYR_VERSION}}"
cd zephyrproject
west update
west zephyr-export
pip install -r zephyr/scripts/requirements.txt
echo "ZEPHYR_BASE=$HOME/zephyrproject/zephyr" >> $GITHUB_ENV
echo "ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-0.15.2/" >> $GITHUB_ENV
echo "ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${{env.SDK_VERSION}}/" >> $GITHUB_ENV
shell: bash
4 changes: 2 additions & 2 deletions core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@ CodeBuilder generateCMakeCode(
cMakeCode.pr("# Selecting default board");
cMakeCode.pr("set(BOARD qemu_cortex_m3)");
}
cMakeCode.pr("# We require Zephyr version 3.2.0");
cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.2.0)");
cMakeCode.pr("# We recommend Zephyr v3.3.0 but we are compatible with older versions also");
cMakeCode.pr("find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE} 3.3.0)");
cMakeCode.newLine();
}

Expand Down