Skip to content

refactor: remove ZEPHYR_SDK_VERSION from Zephyr SDK path #91

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

Open
innovaker wants to merge 2 commits into
base: 2.5-branch
Choose a base branch
from
Open

refactor: remove ZEPHYR_SDK_VERSION from Zephyr SDK path #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9cfa898
refactor: remove `ZEPHYR_SDK_VERSION` from Zephyr SDK path
innovaker Jun 17, 2021
1d5b180
feat(dev-generic): remove `ENV ZEPHYR_SDK_VERSION`
innovaker Jun 15, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ jobs:
run: gdb --version
- name: Test arm-zephyr-eabi-gdb
if: ${{ matrix.architecture == 'arm' }}
run: /opt/zephyr-sdk-${ZEPHYR_SDK_VERSION}/arm-zephyr-eabi/bin/arm-zephyr-eabi-gdb --version
run: /opt/zephyr-sdk/arm-zephyr-eabi/bin/arm-zephyr-eabi-gdb --version
- name: Test tio
run: tio --version
- name: Test socat
Expand Down
5 changes: 1 addition & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,6 @@ RUN \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ARG ZEPHYR_SDK_VERSION
ENV ZEPHYR_SDK_VERSION=${ZEPHYR_SDK_VERSION}

ENV DEBIAN_FRONTEND=

#------------------------------------------------------------------------------
Expand All @@ -86,7 +83,7 @@ FROM common AS build
ARG ARCHITECTURE
ARG ZEPHYR_SDK_VERSION
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}
ARG ZEPHYR_SDK_INSTALL_DIR=/opt/zephyr-sdk
RUN \
apt-get -y update \
&& apt-get -y install --no-install-recommends \
Expand Down
⚡