Merge pull request #163 from rbaron/nrf-2.4.2

Bump nrf-connect sdk version to 2.4

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 {
-	"name": "nrf-connect:v2.2",
+	"name": "nrf-connect:v2.4",
-	"image": "nordicplayground/nrfconnect-sdk:v2.2-branch",
+	"image": "nordicplayground/nrfconnect-sdk:v2.4-branch",
 	"features": {
 	},
 	"customizations": {

.github/actions/build/Dockerfile

@@ -1,5 +0,0 @@
-FROM nordicplayground/nrfconnect-sdk:v2.2-branch
-
-COPY build.sh /build.sh
-
-ENTRYPOINT ["/build.sh"]

.github/actions/build/action.yml

@@ -1,27 +1,27 @@
-name: 'Build'
+name: "Build"
-description: 'Builds a nrf-connect sample for b-parasite'
+description: "Builds a nrf-connect sample for b-parasite"
 inputs:
   sample-dir:
-    description: 'Sample directory to build'
+    description: "Sample directory to build"
     required: true
   board:
-    description: 'Board definition to use'
+    description: "Board definition to use"
     default: bparasite_nrf52840
   revision:
-    description: 'Board revision use'
+    description: "Board revision use"
-    default: '1.2.0'
+    default: "2.0.0"
   cmake-extra:
-    description: 'Extra CMake arguments'
+    description: "Extra CMake arguments"
-    default: ''
+    default: ""
-  output-bin:
-    description: 'Name of the .hex output'
-    required: true
 runs:
-  using: 'docker'
+  using: "composite"
-  image: 'Dockerfile'
+  steps:
-  args:
+    - run: |
-    - ${{ inputs.sample-dir }}
+        docker run --rm -v ${GITHUB_WORKSPACE}:/repo \
-    - ${{ inputs.board }}
+          nordicplayground/nrfconnect-sdk:v2.4-branch \
-    - ${{ inputs.revision }}
+          west build \
-    - ${{ inputs.cmake-extra }}
+            --build-dir /repo/${{ inputs.sample-dir }}/build \
-    - ${{ inputs.output-bin }}
+            --pristine \
+            --board ${{ inputs.board }}@${{ inputs.revision }} \
+            /repo/${{ inputs.sample-dir }} -- ${{ inputs.cmake-extra }}
+      shell: bash

.github/actions/build/build.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-set -eux -o pipefail
-
-SAMPLE_DIR=$1
-BOARD=$2
-REVISION=$3
-CMAKE_EXTRA=$4
-OUTPUT_BIN=$5
-
-TODAY=$(date +'%Y-%m-%d')
-
-# Replaces occurrences of "__TODAY__" with $TODAY in $CMAKE_EXTRA.
-CMAKE_EXTRA="${CMAKE_EXTRA/__TODAY__/"$TODAY"}"
-
-cd "${GITHUB_WORKSPACE}/${SAMPLE_DIR}"
-
-echo $CMAKE_EXTRA
-
-west build --build-dir ./build --pristine --board "${BOARD}@${REVISION}" -- $CMAKE_EXTRA
-
-mv build/zephyr/zephyr.hex build/zephyr/"${OUTPUT_BIN}"

.github/actions/build_and_upload/action.yml

@@ -1,33 +0,0 @@
-name: 'Build and upload artifact'
-description: 'Builds a nrf-connect sample for b-parasite'
-inputs:
-  sample-dir:
-    description: 'Sample directory to build'
-    required: true
-  board:
-    description: 'Board definition to use'
-    required: true
-  revision:
-    description: 'Board revision use'
-    default: '1.2.0'
-  cmake-extra:
-    description: 'Extra CMake arguments'
-    default: ''
-  output-bin:
-    description: 'Name of the .hex output'
-    required: true
-
-runs:
-  using: "composite"
-  steps:
-    - uses: ./.github/actions/build
-      with:
-        sample-dir: ${{ inputs.sample-dir }}
-        board: ${{ inputs.board }}
-        revision: ${{ inputs.revision }}
-        cmake-extra: ${{ inputs.cmake-extra }}
-        output-bin: ${{ inputs.output-bin }}
-    - uses: actions/upload-artifact@v3
-      with:
-        name: sample-binaries
-        path: ${{ inputs.sample-dir }}/build/zephyr/${{ inputs.output-bin }}

.github/workflows/b-parasite.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Check clang-format
         uses: jidicula/clang-format-action@v4.9.0
         with:
-          check-path: 'code/nrf-connect'
+          check-path: "code/nrf-connect"
           exclude-regex: '\/build\/'
 
   build-blinky:
@@ -27,7 +27,7 @@ jobs:
       - lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build blinky
         uses: ./.github/actions/build
         with:
@@ -43,7 +43,7 @@ jobs:
       - lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build input
         uses: ./.github/actions/build
         with:
@@ -59,7 +59,7 @@ jobs:
       - lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build soil_read_loop
         uses: ./.github/actions/build
         with:
@@ -79,9 +79,9 @@ jobs:
       - lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build
-        uses: ./.github/actions/build_and_upload
+        uses: ./.github/actions/build
         with:
           sample-dir: code/nrf-connect/samples/ble
           board: bparasite_${{ matrix.soc }}
@@ -100,9 +100,9 @@ jobs:
       - lint
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build
-        uses: ./.github/actions/build_and_upload
+        uses: ./.github/actions/build
         with:
           sample-dir: code/nrf-connect/samples/zigbee
           board: bparasite_${{ matrix.soc }}