From b8341e185ab694f7c596b81d03ada34ac76d2f1c Mon Sep 17 00:00:00 2001 From: innovaker <66737976+innovaker@users.noreply.github.com> Date: Fri, 14 May 2021 19:12:34 +0100 Subject: [PATCH] feat: Zephyr SDK 0.12.0 See: https://github.com/zephyrproject-rtos/sdk-ng/releases/tag/v0.12.0 PR: zmkfirmware/zmk-docker#77 --- .github/workflows/containers.yml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 9c74854..38904cc 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -2,7 +2,7 @@ name: Containers env: zephyr-version: 2.4.0 - zephyr-sdk-version: 0.11.4 + zephyr-sdk-version: 0.12.0 sha-abbrev-length: 12 no-cache: ${{ secrets.NO_CACHE != null || github.event_name == 'workflow_dispatch' || github.event_name == 'schedule' }} ignore-actions-cache: ${{ secrets.IGNORE_ACTIONS_CACHE != null }} diff --git a/Dockerfile b/Dockerfile index 2d051df..e0c2462 100644 --- a/Dockerfile +++ b/Dockerfile @@ -82,7 +82,7 @@ FROM common AS build ARG ARCHITECTURE ARG ZEPHYR_SDK_VERSION -ARG ZEPHYR_SDK_SETUP_FILENAME=zephyr-toolchain-${ARCHITECTURE}-${ZEPHYR_SDK_VERSION}-setup.run +ARG ZEPHYR_SDK_SETUP_FILENAME=zephyr-toolchain-${ARCHITECTURE}-${ZEPHYR_SDK_VERSION}-x86_64-linux-setup.run ARG ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk-${ZEPHYR_SDK_VERSION} RUN \ apt-get -y update \