From 9cfa89814c4e42d50a61efe3044142eafd581f60 Mon Sep 17 00:00:00 2001
From: innovaker <66737976+innovaker@users.noreply.github.com>
Date: Thu, 17 Jun 2021 21:31:33 +0100
Subject: [PATCH 1/2] refactor: remove `ZEPHYR_SDK_VERSION` from Zephyr SDK
 path

This provides a consistent environment between releases which is easier to script.
---
 .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 b02dcf63..f442ae32 100644
--- a/.github/workflows/containers.yml
+++ b/.github/workflows/containers.yml
@@ -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
diff --git a/Dockerfile b/Dockerfile
index 31ce40c5..f160ffea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -86,7 +86,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 \

From 1d5b1800da4550c387af9df2c6956c22d59957d8 Mon Sep 17 00:00:00 2001
From: innovaker <66737976+innovaker@users.noreply.github.com>
Date: Tue, 15 Jun 2021 15:40:24 +0100
Subject: [PATCH 2/2] feat(dev-generic): remove `ENV ZEPHYR_SDK_VERSION`

This is no longer required.

Reverts: edbe96249207e96a7b86103225d56c489c892bd5.
---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f160ffea..ae5923bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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=
 
 #------------------------------------------------------------------------------