ci: fix build

NordicSemiconductor · Dec 5, 2023 · 8cc0973 · 8cc0973
1 parent 8c314a4
commit 8cc0973
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/build-and-release.yaml b/.github/workflows/build-and-release.yaml
@@ -105,13 +105,13 @@ jobs:
         working-directory: firmware
         if: matrix.loglevel == 'debug'
         run: |
-          docker run --rm -v ${PWD}:/workdir/project nordicplayground/nrfconnect-sdk:main west build -p always -b ${{ matrix.board }} --build-dir /workdir/project/build -- -DOVERLAY_CONFIG="overlay-azure.conf;overlay-pgps.conf;overlay-debug.conf;asset-tracker-cloud-firmware-azure.conf;firmware.conf" -DEXTRA_CFLAGS="-Werror"
+          docker run --rm -v ${PWD}:/workdir/project nordicplayground/nrfconnect-sdk:main west build -p always -b ${{ matrix.board }} --build-dir /workdir/project/build -s /workdir/project -- -DOVERLAY_CONFIG="overlay-azure.conf;overlay-pgps.conf;overlay-debug.conf;asset-tracker-cloud-firmware-azure.conf;firmware.conf" -DEXTRA_CFLAGS="-Werror"
 
       - name: Build with debug disabled
         working-directory: firmware
         if: matrix.loglevel != 'debug'
         run: |
-          docker run --rm -v ${PWD}:/workdir/project nordicplayground/nrfconnect-sdk:main west build -p always -b ${{ matrix.board }} --build-dir /workdir/project/build -- -DOVERLAY_CONFIG="overlay-azure.conf;overlay-pgps.conf;asset-tracker-cloud-firmware-azure.conf;firmware.conf" -DEXTRA_CFLAGS="-Werror"
+          docker run --rm -v ${PWD}:/workdir/project nordicplayground/nrfconnect-sdk:main west build -p always -b ${{ matrix.board }} --build-dir /workdir/project/build -s /workdir/project -- -DOVERLAY_CONFIG="overlay-azure.conf;overlay-pgps.conf;asset-tracker-cloud-firmware-azure.conf;firmware.conf" -DEXTRA_CFLAGS="-Werror"
 
       - name: Copy firmware
         working-directory: firmware

diff --git a/.github/workflows/update-from-ncs.yaml b/.github/workflows/update-from-ncs.yaml
@@ -21,7 +21,7 @@ jobs:
         run: rm -rf ./{src,boards,child_image,tests}
       - name: Update from upstream
         run: |
-          git clone --single-branch --branch main https://github.com/nrfconnect/sdk-nrf sdk-nrf
+          git clone --single-branch --branch v2.5-branch --depth 1 https://github.com/nrfconnect/sdk-nrf sdk-nrf
           cp -rv sdk-nrf/applications/asset_tracker_v2/* ./
           echo "UPSTREAM_REV=`git -C sdk-nrf rev-parse HEAD | tr -d '\n'`" >> $GITHUB_ENV
           rm -rf sdk-nrf

diff --git a/README.md b/README.md
@@ -1,16 +1,16 @@
 # nRF Asset Tracker for Azure firmware
 
 ![Build and Release](https://github.com/NordicSemiconductor/asset-tracker-cloud-firmware-azure/workflows/Build%20and%20Release/badge.svg)
-[![@commitlint/config-conventional](https://img.shields.io/badge/%40commitlint-config--conventional-brightgreen
-)](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-conventional)
-[![Nordic ClangFormat](https://img.shields.io/static/v1?label=Nordic&message=ClangFormat&labelColor=00A9CE&color=337ab7)](https://github.com/nrfconnect/sdk-nrf/blob/main/.clang-format)
+[![@commitlint/config-conventional](https://img.shields.io/badge/%40commitlint-config--conventional-brightgreen)](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-conventional)
+[![Nordic ClangFormat](https://img.shields.io/static/v1?label=Nordic&message=ClangFormat&labelColor=00A9CE&color=337ab7)](https://github.com/nrfconnect/sdk-nrf/blob/v2.5-branch/.clang-format)
 [![Zephyr compliance](https://img.shields.io/static/v1?label=Zephyr&message=compliance&labelColor=4e109e&color=337ab7)](https://docs.zephyrproject.org/latest/contribute/index.html#coding-style)
 
 This repository maintains an out-of-tree **copy** of the
-[Asset Tracker v2](https://github.com/nrfconnect/sdk-nrf/tree/main/applications/asset_tracker_v2)
+[Asset Tracker v2](https://github.com/nrfconnect/sdk-nrf/tree/v2.5-branch/applications/asset_tracker_v2)
 application to show how to use open-source tools for automating the creation of
 building HEX files, and continuously integrating the firmware against the cloud
-implementation of the [nRF Asset Tracker for Azure](https://github.com/NordicSemiconductor/asset-tracker-cloud-azure-js).
+implementation of the
+[nRF Asset Tracker for Azure](https://github.com/NordicSemiconductor/asset-tracker-cloud-azure-js).
 
 The copy is regularly updated from source and kept in sync with the NCS release
 branches.

diff --git a/package.json b/package.json
@@ -46,9 +46,7 @@
         "@semantic-release/github",
         {
           "successComment": false,
-          "failTitle": false
-        },
-        {
+          "failTitle": false,
           "assets": [
             {
               "path": "/home/runner/work/asset-tracker-cloud-firmware-azure/asset-tracker-cloud-firmware-azure/thingy91_nrf9160_ns-nodebug-*/merged.hex",