From c94dce1726b81101352b0728d93c520a7de64fb9 Mon Sep 17 00:00:00 2001 From: Peter Johanson Date: Tue, 26 Oct 2021 00:31:16 -0400 Subject: [PATCH] feat: Zephyr 3.0.0 See: https://docs.zephyrproject.org/3.0.0/getting_started/index.html --- .github/workflows/containers.yml | 2 +- Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 974794c..5d98a79 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -1,7 +1,7 @@ name: Containers env: - zephyr-version: 2.5.0 + zephyr-version: 3.0.0 zephyr-sdk-version: 0.13.2 sha-abbrev-length: 12 no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} diff --git a/Dockerfile b/Dockerfile index 5574387..a852a25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,6 @@ RUN \ apt-get -y update \ && apt-get -y install --no-install-recommends \ ccache \ - cmake \ file \ gcc \ gcc-multilib \ @@ -25,6 +24,7 @@ RUN \ python3-wheel \ && pip3 install \ -r https://raw.githubusercontent.com/zephyrproject-rtos/zephyr/v${ZEPHYR_VERSION}/scripts/requirements-base.txt \ + && pip3 install cmake \ && apt-get remove -y --purge \ python3-dev \ python3-pip \ @@ -53,6 +53,7 @@ RUN \ gpg \ gpg-agent \ less \ + libpython3.8-dev \ libsdl2-dev \ locales \ nano \