From eeb7613c856481510d0a7e99d3d7e33298057806 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Fri, 4 Apr 2025 13:36:07 +0200 Subject: [PATCH 1/5] VERSION: Update to 3.0.0-rc1 Update version in VERSION to 3.0.0-rc1 Signed-off-by: Bjarki Arge Andreasen --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e7d47299cdb1..ece1f9640670 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.9.99 +3.0.0-rc1 \ No newline at end of file From 758766b164b0cafeb6de1abb500adf5d89c48f49 Mon Sep 17 00:00:00 2001 From: Bjarki Arge Andreasen Date: Fri, 4 Apr 2025 13:36:11 +0200 Subject: [PATCH 2/5] MANIFEST: Update revisions to v3.0.0-ncs-rc1 Update west.yml revisions to v3.0.0-ncs-rc1 Signed-off-by: Bjarki Arge Andreasen --- west.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/west.yml b/west.yml index 749630c005ee..991a449e8971 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: e48bca44dd596dc66d71378e97bf5ceff2c483d0 + revision: v3.0.0-ncs-rc1 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -127,7 +127,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 6df89a84be878d912dad5d7a5c6a9c82d2bdbab2 + revision: v3.0.0-ncs-rc1 path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -144,11 +144,11 @@ manifest: - name: nrfxlib repo-path: sdk-nrfxlib path: nrfxlib - revision: 9a7b8e6aec3f031b520ff55c658462c748f0ed3e + revision: v3.0.0-ncs-rc1 - name: trusted-firmware-m repo-path: sdk-trusted-firmware-m path: modules/tee/tf-m/trusted-firmware-m - revision: 0002817d4e50c8832028c280996dfeac47938138 + revision: v3.0.0-ncs-rc1 - name: psa-arch-tests repo-path: sdk-psa-arch-tests path: modules/tee/tf-m/psa-arch-tests @@ -156,7 +156,7 @@ manifest: - name: matter repo-path: sdk-connectedhomeip path: modules/lib/matter - revision: df5368cb9beec725a7ccac725a4aecec272b1897 + revision: v3.0.0-ncs-rc1 west-commands: scripts/west/west-commands.yml submodules: - name: nlio @@ -175,7 +175,7 @@ manifest: - name: nrf-802154 repo-path: sdk-nrf-802154 path: nrf-802154 - revision: 8058d3003bbcef71b1b3b052c6a11a7e9903c0ae + revision: v3.0.0-ncs-rc1 groups: - nrf-802154 - name: dragoon @@ -196,7 +196,7 @@ manifest: compare-by-default: false - name: find-my repo-path: sdk-find-my - revision: 01af9578b7510f4f312c274465b92c27ef67c474 + revision: v3.0.0-ncs-rc1 groups: - find-my - name: azure-sdk-for-c @@ -231,10 +231,10 @@ manifest: upstream-sha: c6eaeda5a1c1c5dbb24dce7e027340cb8893a77b compare-by-default: false - name: suit-generator - revision: 1817ea1aac7cd0cfae4d50b8aea897d9140833ef + revision: v3.0.0-ncs-rc1 path: modules/lib/suit-generator - name: suit-processor - revision: 94effb7561b3a970195df76165e4b15e4ac0c34e + revision: v3.0.0-ncs-rc1 path: modules/lib/suit-processor - name: doc-internal repo-path: doc-internal From 83d9110f024cad6d6b2dbed901264f96f41f80d1 Mon Sep 17 00:00:00 2001 From: Thomas Stilwell Date: Fri, 4 Apr 2025 14:20:09 +0200 Subject: [PATCH 3/5] ci: Use CI_LIB and test-nrf from v3.0-branch Use CI_LIB and test-nrf from v3.0-branch Signed-off-by: Thomas Stilwell --- Jenkinsfile | 2 +- test-manifests/99-default-test-nrf.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cb83d266db04..5bddcfbedd2f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -@Library("CI_LIB") _ +@Library("CI_LIB@v3.0-branch") _ def pipeline = new ncs.sdk_nrf.Main() diff --git a/test-manifests/99-default-test-nrf.yml b/test-manifests/99-default-test-nrf.yml index b5fce8359e58..558aa192a819 100644 --- a/test-manifests/99-default-test-nrf.yml +++ b/test-manifests/99-default-test-nrf.yml @@ -11,7 +11,7 @@ manifest: - name: test_nrf remote: ncs-test repo-path: test-fw-nrfconnect-nrf - revision: master + revision: v3.0-branch import: name-blocklist: [sdk-nrf] userdata: From c7bde3d09a3dd93fd3cc9091b153230a5df25857 Mon Sep 17 00:00:00 2001 From: Gerard Marull-Paretas Date: Thu, 3 Apr 2025 15:03:45 +0200 Subject: [PATCH 4/5] doc: utils: TF-M main page should be wrapper It was recently updated. Signed-off-by: Gerard Marull-Paretas --- doc/_utils/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/_utils/utils.py b/doc/_utils/utils.py index 645b6f370bdb..e5853285cb33 100644 --- a/doc/_utils/utils.py +++ b/doc/_utils/utils.py @@ -24,7 +24,7 @@ "nrfxlib": ("nrfxlib", "README", "nrfxlib"), "zephyr": ("Zephyr Project", "index", "zephyr"), "mcuboot": ("MCUboot", "wrapper", "mcuboot"), - "tfm": ("Trusted Firmware-M", "index", "trusted-firmware-m"), + "tfm": ("Trusted Firmware-M", "wrapper", "trusted-firmware-m"), "matter": ("Matter", "index", "matter"), "kconfig": ("Kconfig Reference", "index", None), } From ee0f5c3178169c194232b2588ee9bce16ea02667 Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Fri, 4 Apr 2025 13:12:49 +0000 Subject: [PATCH 5/5] manifest: Update sdk-zephyr revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 991a449e8971..7336d8ba63ad 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: v3.0.0-ncs-rc1 + revision: 63c9a59854a9fb48a5b2859fee78360b4a54ed5c import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above