fix: use Device Tree Compiler 1.4.7-3

Fixes #36
bifravst · Mar 27, 2020 · 7bbf326 · 7bbf326
1 parent e5b6b2c
commit 7bbf326
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -5,6 +5,7 @@ on: push
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   BROKER_HOSTNAME: ${{ secrets.BROKER_HOSTNAME }}
+  DEVICE_TREE_COMPILER_VERSION: 1.4.7-3
 
 jobs:
   build:
@@ -42,17 +43,17 @@ jobs:
         id: cache-dtc
         with:
           path: device-tree-compiler/
-          key: ${{ runner.OS }}-device-tree-compiler_1.4.7-1_amd64.deb
+          key: ${{ runner.OS }}-device-tree-compiler_${DEVICE_TREE_COMPILER_VERSION}_amd64.deb
 
-      - name: Download Device Tree Compile 1.4.7
+      - name: Download Device Tree Compiler
         if: steps.cache-dtc.outputs.cache-hit != 'true'
         run: |
           mkdir -p ${GITHUB_WORKSPACE}/device-tree-compiler/
-          wget -q 'http://mirrors.kernel.org/ubuntu/pool/main/d/device-tree-compiler/device-tree-compiler_1.4.7-1_amd64.deb' -O ${GITHUB_WORKSPACE}/device-tree-compiler/device-tree-compiler_1.4.7-1_amd64.deb
+          wget -q http://mirrors.kernel.org/ubuntu/pool/main/d/device-tree-compiler/device-tree-compiler_${DEVICE_TREE_COMPILER_VERSION}_amd64.deb -O ${GITHUB_WORKSPACE}/device-tree-compiler/device-tree-compiler_${DEVICE_TREE_COMPILER_VERSION}_amd64.deb
 
-      - name: Install Device Tree Compile 1.4.7
+      - name: Install Device Tree Compiler
         run: |
-          sudo dpkg -i ${GITHUB_WORKSPACE}/device-tree-compiler/device-tree-compiler_1.4.7-1_amd64.deb
+          sudo dpkg -i ${GITHUB_WORKSPACE}/device-tree-compiler/device-tree-compiler_${DEVICE_TREE_COMPILER_VERSION}_amd64.deb
 
       # Workaround for https://github.com/NordicSemiconductor/pc-nrfutil/issues/288
       - name: Install latest PIP

diff --git a/Dockerfile b/Dockerfile
@@ -14,7 +14,7 @@ RUN mkdir /data/gcc-arm && \
     tar xjf /data/gcc-arm/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
 ENV ZEPHYR_TOOLCHAIN_VARIANT=gnuarmemb
 ENV GNUARMEMB_TOOLCHAIN_PATH=/workdir/gcc-arm-none-eabi-7-2018-q2-update
-# Device Tree Compiler 1.4.7
+# Device Tree Compiler
 ARG DEVICE_TREE_COMPILER_VERSION=1.4.7-3
 RUN mkdir -p /data/device-tree-compiler/ && \
     wget -q http://mirrors.kernel.org/ubuntu/pool/main/d/device-tree-compiler/device-tree-compiler_${DEVICE_TREE_COMPILER_VERSION}_amd64.deb \