Skip to content

Commit db0cb88

Browse files
committed
treewide: Align sources to NCS v3.1.0
- update workflow files - update app VERSION - update docs Signed-off-by: marcin <marcin@makj.nordicsemi.no>
1 parent db298df commit db0cb88

7 files changed

Lines changed: 46 additions & 50 deletions

File tree

.github/workflows/build-aliro-app.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
workflow_dispatch:
1414
inputs:
1515
ncs_sdk_version:
16-
default: v2.8.0
16+
default: v3.1.0
1717
description: NCS SDK version
1818
type: string
1919
aliro_app_folder:
@@ -23,7 +23,7 @@ on:
2323
workflow_call:
2424
inputs:
2525
ncs_sdk_version:
26-
default: v2.8.0
26+
default: v3.1.0
2727
description: NCS SDK version
2828
type: string
2929
aliro_app_folder:
@@ -34,32 +34,32 @@ on:
3434

3535
env:
3636
board: nrf54l15dk/nrf54l15/cpuapp
37-
ncs_sdk_version: v2.8.0
37+
ncs_sdk_version: v3.1.0
3838
aliro_app_folder: app
3939

40-
jobs:
40+
jobs:
4141
build:
42-
name: Build
43-
runs-on: ubuntu-22.04
42+
name: Build
43+
runs-on: ubuntu-24.04
4444

45-
steps:
45+
steps:
4646
- name: Checkout repository
47-
uses: actions/checkout@v4
47+
uses: actions/checkout@v4
4848

4949
- name: Setup sdk
5050
id: setup-sdk
5151
uses: ./.github/workflows/setup-sdk
5252
with:
53-
toolchain_manager_version: 0.15.0
53+
sdk_manager_version: 1.6.0
5454
nrf_util_url: "https://developer.nordicsemi.com/.pc-tools/nrfutil/x64-linux/nrfutil-launcher-x86_64-unknown-linux-gnu-1.2.0-9ca8c73"
5555
ncs_sdk_version: ${{ inputs.ncs_sdk_version || github.event.inputs.ncs_sdk_version || env.ncs_sdk_version }}
5656
ssh_private_key: ${{ secrets.SSH_PRIVATE_KEY }}
5757

5858
- name: Build Aliro application
5959
run: |
60-
nrfutil toolchain-manager launch west zephyr-export
60+
nrfutil sdk-manager toolchain launch --ncs-version ${{ inputs.ncs_sdk_version }} west zephyr-export
6161
cd app
62-
nrfutil toolchain-manager launch west build -- -b ${{ env.board }}
62+
nrfutil sdk-manager toolchain launch --ncs-version ${{ inputs.ncs_sdk_version }} west build -- -b ${{ env.board }}
6363
6464
- name: Upload build result
6565
if: always()

.github/workflows/compliance.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ on:
1010
jobs:
1111
code-compliance:
1212
name: Zephyr compliance
13-
runs-on: ubuntu-22.04
14-
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v2.9.0
13+
runs-on: ubuntu-24.04
14+
container: ghcr.io/nrfconnect/sdk-nrf-toolchain:v3.1.0
1515
defaults:
1616
run:
1717
# Bash shell is needed to set toolchain related environment variables in docker container

.github/workflows/setup-sdk/action.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ name: NCS Setup
66
description: "Configure environment to build and test NCS-Aliro project"
77

88
inputs:
9-
toolchain_manager_version:
9+
sdk_manager_version:
1010
required: true
1111
nrf_util_url:
1212
required: true
@@ -48,7 +48,7 @@ runs:
4848
sudo apt install -y gcc-multilib g++-multilib
4949
shell: bash
5050

51-
- name: Cache nrfutil, toolchain-manager
51+
- name: Cache nrfutil, sdk-manager
5252
id: nrf-cache
5353
if: always()
5454
uses: actions/cache@v4.2.0
@@ -57,7 +57,7 @@ runs:
5757
/home/runner/.local/bin/nrfutil
5858
/home/runner/.nrfutil
5959
/home/runner/ncs
60-
key: nrfutil-ncs-${{ inputs.nrf_util_url }} NCS_SDK_VERSION=${{ inputs.ncs_sdk_version }} TOOLCHAIN_MANAGER_VERSION=${{ inputs.toolchain_manager_version }}
60+
key: nrfutil-ncs-${{ inputs.nrf_util_url }} NCS_SDK_VERSION=${{ inputs.ncs_sdk_version }} SDK_MANAGER_VERSION=${{ inputs.sdk_manager_version }}
6161

6262
- name: Cache west workspace
6363
id: west-cache
@@ -72,24 +72,24 @@ runs:
7272
# Any change in west.yml will force to run 'west init' step again, new cache will be created
7373
key: ${{ runner.os }}-west-${{ hashFiles(format('{0}/west.yml', github.workspace)) }}
7474

75-
- name: Install nrfutil, toolchain-manager
75+
- name: Install nrfutil, sdk-manager
7676
if: steps.nrf-cache.outputs.cache-hit != 'true'
7777
run: |
7878
mkdir -p $HOME/.local/bin
7979
wget -nv ${{ inputs.nrf_util_url }} -O $HOME/.local/bin/nrfutil && chmod +x $HOME/.local/bin/nrfutil
80-
nrfutil install toolchain-manager=${{ inputs.toolchain_manager_version }} && chmod +777 $HOME/.nrfutil
81-
nrfutil toolchain-manager install --ncs-version ${{ inputs.ncs_sdk_version }}
80+
nrfutil install sdk-manager=${{ inputs.sdk_manager_version }} && chmod +777 $HOME/.nrfutil
81+
nrfutil sdk-manager toolchain install --ncs-version ${{ inputs.ncs_sdk_version }}
8282
shell: bash
8383

8484
- name: West init, west update
8585
if: steps.west-cache.outputs.cache-hit != 'true'
8686
run: |
87-
nrfutil toolchain-manager launch west init -- -l --mf west.yml
88-
nrfutil toolchain-manager launch west update -- --narrow -o=--depth=1
87+
nrfutil sdk-manager toolchain launch --ncs-version ${{ inputs.ncs_sdk_version }} west init -- -l --mf west.yml
88+
nrfutil sdk-manager toolchain launch --ncs-version ${{ inputs.ncs_sdk_version }} west update -- --narrow -o=--depth=1
8989
shell: bash
9090

9191
- name: West update on cache hit
9292
if: steps.west-cache.outputs.cache-hit == 'true'
9393
run: |
94-
nrfutil toolchain-manager launch west update -- --narrow -o=--depth=1
94+
nrfutil sdk-manager toolchain launch --ncs-version ${{ inputs.ncs_sdk_version }} west update -- --narrow -o=--depth=1
9595
shell: bash

README.md

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ NCS manifest repo for the door lock reference application.
55

66
Before getting started, you must set up the nRF Connect SDK development environment.
77

8-
Follow the official [Getting Started Guide](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html) article: execute the following steps:
8+
Follow the official [Getting Started Guide](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html) article: execute the following steps:
99

10-
- [Select and Update OS](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#select_and_update_os)
11-
- [Install dependencies](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#install_dependencies)
12-
- [Get Zephyr and install Python dependencies](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#get_zephyr_and_install_python_dependencies)
13-
- [Install the Zephyr SDK](https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/develop/getting_started/index.html#install_the_zephyr_sdk)
10+
- [Select and Update OS](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#select_and_update_os)
11+
- [Install dependencies](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#install_dependencies)
12+
- [Get Zephyr and install Python dependencies](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#get_zephyr_and_install_python_dependencies)
13+
- [Install the Zephyr SDK](https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/develop/getting_started/index.html#install_the_zephyr_sdk)
1414

1515
### Initialization
1616

@@ -23,10 +23,6 @@ Run the following commands:
2323
west init -m https://github.com/nrfconnect/ncs-door-lock-app --mr main door-lock-workspace
2424
```
2525

26-
> **NOTE**
27-
>
28-
> Before executing `west update` make sure that you have access to `ncs-aliro` private repository.
29-
3026
```shell
3127
# update nRF Connect SDK modules
3228
cd door-lock-workspace

app/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
VERSION_MAJOR = 0
22
VERSION_MINOR = 3
3-
PATCHLEVEL = 0
3+
PATCHLEVEL = 1
44
VERSION_TWEAK = 0
55
EXTRAVERSION =

docs/building_and_running.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ To build and run the application on one of the :ref:`supported development kits
7575

7676
.. code-block:: console
7777
78-
*** Booting My Application v0.1.0-f0e5cf444fb0 ***
79-
*** Using nRF Connect SDK v2.9.0-7787b2649840 ***
78+
*** Booting My Application v0.3.0-8264718b4735 ***
79+
*** Using nRF Connect SDK v3.1.0-6c6e5b32496e ***
8080
*** Using Zephyr OS v3.7.99-1f8f3dc29142 ***
8181
[00:00:00.009,613] <inf> door_lock_app: Starting nRF Door Lock Reference Application for the nRF Connect SDK

docs/links.txt

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,35 @@
99
.. _`test harness hardware requirements`: https://github.com/csa-access-control/aliro-certification-tool?tab=readme-ov-file#requirements
1010
.. _`test harness usage instructions`: https://github.com/csa-access-control/aliro-certification-tool?tab=readme-ov-file#usage-instructions
1111
.. _`running test scripts`: https://github.com/csa-access-control/aliro-certification-tool?tab=readme-ov-file#c---creating-a-test-run-running-test-scripts
12-
.. _`Setting up the command-line build environment`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/installation/install_ncs.html#set_up_the_command-line_build_environment
13-
.. _`Zephyr CMake package`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/build/zephyr_cmake_package.html#cmake-pkg
12+
.. _`Setting up the command-line build environment`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/installation/install_ncs.html#set_up_the_command-line_build_environment
13+
.. _`Zephyr CMake package`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/build/zephyr_cmake_package.html#cmake-pkg
1414
.. _`Test Harness issue #191`: https://github.com/csa-access-control/aliro-certification-tool/issues/191
1515

1616
.. ### Source: docs.nordicsemi.com
1717
Requires manual update to align it with the NCS version.
1818

19-
.. ### ========================= nRF Connect SDK - v2.9.0 =========================
19+
.. ### ========================= nRF Connect SDK - v3.1.0 =========================
2020

21-
.. _`Installing the nRF Connect SDK`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/installation/install_ncs.html
22-
.. _`Get the nRF Connect SDK code`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/installation/install_ncs.html#get_the_nrf_connect_sdk_code
21+
.. _`Installing the nRF Connect SDK`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/installation/install_ncs.html
22+
.. _`Get the nRF Connect SDK code`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/installation/install_ncs.html#get_the_nrf_connect_sdk_code
2323

24-
.. _`Platform Security Architecture (PSA)`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/libraries/security/nrf_security/doc/configuration.html#psa_crypto_support
24+
.. _`Platform Security Architecture (PSA)`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/libraries/security/nrf_security/doc/configuration.html#psa_crypto_support
2525

26-
.. _`Bluetooth LE Controller` : https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/protocols/bt/bt_stack_arch.html
26+
.. _`Bluetooth LE Controller` : https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/protocols/bt/bt_stack_arch.html
2727

28-
.. _`West`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/dev_model_and_contributions/code_base.html#ncs-west-intro
28+
.. _`West`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/dev_model_and_contributions/code_base.html#ncs-west-intro
2929

30-
.. _`nRF54L15 DK`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/boards/nordic/nrf54l15dk/doc/index.html#nrf54l15dk-nrf54l15
31-
.. _`nrf54l15dk`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/app_dev/device_guides/nrf54l/index.html
30+
.. _`nRF54L15 DK`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/boards/nordic/nrf54l15dk/doc/index.html#nrf54l15dk-nrf54l15
31+
.. _`nrf54l15dk`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/app_dev/device_guides/nrf54l/index.html
3232

33-
.. _`nRF5340 DK`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/boards/nordic/nrf5340dk/doc/index.html
34-
.. _`nrf5340dk`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/app_dev/device_guides/nrf53/index.html
33+
.. _`nRF5340 DK`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/boards/nordic/nrf5340dk/doc/index.html
34+
.. _`nrf5340dk`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/app_dev/device_guides/nrf53/index.html
3535

36-
.. _`nRF52840 DK`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/zephyr/boards/nordic/nrf52840dk/doc/index.html
37-
.. _`nrf52840dk`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/app_dev/device_guides/nrf52/index.html
36+
.. _`nRF52840 DK`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/zephyr/boards/nordic/nrf52840dk/doc/index.html
37+
.. _`nrf52840dk`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/app_dev/device_guides/nrf52/index.html
3838

39-
.. _`Testing and optimization`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/test_and_optimize.html
40-
.. _`Software maturity`: https://docs.nordicsemi.com/bundle/ncs-2.9.0/page/nrf/releases_and_maturity/software_maturity.html
39+
.. _`Testing and optimization`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/test_and_optimize.html
40+
.. _`Software maturity`: https://docs.nordicsemi.com/bundle/ncs-3.1.0/page/nrf/releases_and_maturity/software_maturity.html
4141

4242
.. #### Development-Tools
4343

0 commit comments

Comments
 (0)