fix: use older command line tools

NordicPlayground · Oct 25, 2022 · 0788ddf · 0788ddf
1 parent 945e18d
commit 0788ddf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/publish-docker.yaml b/.github/workflows/publish-docker.yaml
@@ -24,8 +24,8 @@ jobs:
         include:
           # Defaults
           - ZEPHYR_TOOLCHAIN_VERSION: 0.15.1
-            NORDIC_COMMAND_LINE_TOOLS_VERSION: "Versions-10-x-x/10-18-0/nrf-command-line-tools-10.18.0"
-            EXTRA_CFLAGS: "-Werror"
+            NORDIC_COMMAND_LINE_TOOLS_VERSION: "Versions-10-x-x/10-17-0/nrf-command-line-tools-10.17.0"
+            EXTRA_CFLAGS: "-Werror -Wno-dev"
             # Removed in v1.9
             asset_tracker: disable
             asset_tracker_v2: enable
@@ -67,7 +67,6 @@ jobs:
           # v1.4-branch
           - ncs_branch: v1.4-branch
             ZEPHYR_TOOLCHAIN_VERSION: 0.14.1
-            NORDIC_COMMAND_LINE_TOOLS_VERSION: "Versions-10-x-x/10-17-0/nrf-command-line-tools-10.17.0"
             # asset_tracker_v2 is not available in 1.4
             asset_tracker_v2: disable
             asset_tracker: enable
@@ -102,7 +101,7 @@ jobs:
           docker run --rm -v ${PWD}:/workdir/project \
             -w /workdir/project/nrf/applications/asset_tracker \
             nordicplayground/nrfconnect-sdk:${{ matrix.ncs_branch }} \
-              west build -b nrf9160dk_nrf9160ns
+              west build -b nrf9160dk_nrf9160ns -- -DEXTRA_CFLAGS="${{ matrix.EXTRA_CFLAGS }}"
 
       - uses: actions/upload-artifact@v2
         if: matrix.asset_tracker != 'disable'

diff --git a/.github/workflows/verify.yaml b/.github/workflows/verify.yaml
@@ -19,7 +19,7 @@ jobs:
         include:
           # Defaults
           - ZEPHYR_TOOLCHAIN_VERSION: 0.15.1
-            NORDIC_COMMAND_LINE_TOOLS_VERSION: "Versions-10-x-x/10-18-0/nrf-command-line-tools-10.18.0"
+            NORDIC_COMMAND_LINE_TOOLS_VERSION: "Versions-10-x-x/10-17-0/nrf-command-line-tools-10.17.0"
             EXTRA_CFLAGS: "-Werror"
             # Removed in v1.9
             asset_tracker: disable

diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ARG arch=amd64
 ARG ZEPHYR_TOOLCHAIN_VERSION=0.15.1
 ARG WEST_VERSION=0.14.0
 ARG NRF_UTIL_VERSION=6.1.7
-ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="Versions-10-x-x/10-18-0/nrf-command-line-tools-10.18.0"
+ARG NORDIC_COMMAND_LINE_TOOLS_VERSION="Versions-10-x-x/10-17-0/nrf-command-line-tools-10.17.0"
 
 # System dependencies
 RUN mkdir /workdir/project && \