Skip to content

Conversation

thst-nordic
Copy link
Contributor

Required for west ncs-sbom.

Requires PR: nrfconnect/sdk-zephyr#3282

#24571 was reverted for a test regression.
This is a redo.

  • scripts: Uplift scancode-toolkit v31.4.1
  • ci: Add west ncs-sbom smoke test
  • scripts: Adapt ncs-sbom to scancode-toolkit v32.4.1
  • ci: Extend west ncs-sbom smoke test
  • scripts: Fixed windows requirements for scancode

@NordicBuilder NordicBuilder added the changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. label Oct 15, 2025
@thst-nordic thst-nordic marked this pull request as ready for review October 15, 2025 06:37
@thst-nordic thst-nordic requested review from a team as code owners October 15, 2025 06:37
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 15, 2025

CI Information

To view the history of this post, clich the 'edited' button above
Build number: 5

Inputs:

Sources:

sdk-nrf: PR head: dc1c19a688062c149007479ad1cd866542f0995f

more details

sdk-nrf:

PR head: dc1c19a688062c149007479ad1cd866542f0995f
merge base: 9945db06be3b2c3d983c0c30beda48cda35c7ca3
target head (main): 58433d815751aca939df307aed3c80d082f658c9
Diff

Github labels

Enabled Name Description
ci-disabled Disable the ci execution
ci-all-test Run all of ci, no test spec filtering will be done
ci-force-downstream Force execution of downstream even if twister fails
ci-run-twister Force run twister
ci-run-zephyr-twister Force run zephyr twister
List of changed files detected by CI (6)
.github
│  ├── workflows
│  │  │ west-commands.yml
scripts
│  ├── requirements-build.txt
│  ├── requirements-ci.txt
│  ├── requirements-fixed.txt
│  ├── requirements-west-ncs-sbom.txt
│  ├── west_commands
│  │  ├── sbom
│  │  │  │ scancode_toolkit_detector.py

Outputs:

Toolchain

Version:
Build docker image:

Test Spec & Results: ✅ Success; ❌ Failure; 🟠 Queued; 🟡 Progress; ◻️ Skipped; ⚠️ Quarantine

  • ◻️ Toolchain
  • ◻️ Build twister
  • ◻️ Integration tests
    • ◻️ test-fw-nrfconnect-ble_mesh
Disabled integration tests
    • test-fw-nrfconnect-nrf_lrcs_mosh
    • test-fw-nrfconnect-nrf_lrcs_positioning
    • desktop52_verification
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-chip
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_libmodem-nrf
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_samples
    • test-fw-nrfconnect-nrf-iot_serial_lte_modem
    • test-fw-nrfconnect-nrf-iot_thingy91
    • test-fw-nrfconnect-nrf-iot_zephyr_lwm2m
    • test-fw-nrfconnect-nrf_crypto
    • test-fw-nrfconnect-proprietary_esb
    • test-fw-nrfconnect-ps-main
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread-main
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-wifi
    • test-secdom-samples-public

Note: This message is automatically posted and updated by the CI

Copy link
Contributor

@tejlmand tejlmand left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please checkup commit changes and ordering.
There are changes in one commit being overruled by following commit. Should those be squashed ?

Also commit cd3da98 message is:


scripts: Fixed windows requirements for scancode

Uppercase AMD64 instead of amd64.

But the commit does much more than this.

run: |
pip3 install -r nrf/scripts/requirements-fixed.txt
pip3 install -r nrf/scripts/requirements-west-ncs-sbom.txt
pip3 install -r nrf/scripts/requirements-extra.txt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought requirements-extra.txt was included when populated requirements-fixed.txt, so is this line still needed ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Contributor

@nicu1989 nicu1989 Oct 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you are right, if a PR has requirements-fixed up to date(which it should) with changes in requirements-west-ncs-sbom and requirements-extra then those requirements are not required. I will remove both requirements-extra.txt and requirements-west-ncs-sbom.txt

python -m pip install --upgrade pip
python -m pip install -r nrf/scripts/requirements-fixed.txt
python -m pip install -r nrf/scripts/requirements-west-ncs-sbom.txt
python -m pip install -r nrf/scripts/requirements-extra.txt
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought requirements-extra.txt was included when populated requirements-fixed.txt, so is this line still needed ?

@thst-nordic
Copy link
Contributor Author

Please checkup commit changes and ordering. There are changes in one commit being overruled by following commit. Should those be squashed ?

this PR was merged and then reverted.
https://github.com/nrfconnect/sdk-nrf/pull/24571/commits

  • I considered squashing but they aren't my commits.
  • the commits are in the right order.

@nicu1989
Copy link
Contributor

Please checkup commit changes and ordering. There are changes in one commit being overruled by following commit. Should those be squashed ?

this PR was merged and then reverted. https://github.com/nrfconnect/sdk-nrf/pull/24571/commits

  • I considered squashing but they aren't my commits.
  • the commits are in the right order.

I can try and redo the commits to have basically 3: workflow update, scancode uplift and scancode json adaptation.

Required for west ncs-sbom.

Signed-off-by: Nicolae Dicu <[email protected]>
Scancode outputs json format 4.1.0 now.
Sbom has been adapted.

Signed-off-by: Nicolae Dicu <[email protected]>
Run west ncs-sbom command for supported OS:
windows-latest
ubuntu-24.04

on dummy file and verify scancode version.

Signed-off-by: Nicolae Dicu <[email protected]>
@nicu1989 nicu1989 force-pushed the update_scancodetoolkit branch from cd3da98 to a2dc370 Compare October 15, 2025 13:40
@NordicBuilder NordicBuilder requested a review from a team October 15, 2025 13:41
Nordic version of x690 does not include `tests` folder.
exhuma/x690#2

Signed-off-by: Jan Gałda <[email protected]>
@jangalda-nsc jangalda-nsc force-pushed the update_scancodetoolkit branch from 019b94a to dc1c19a Compare October 16, 2025 07:13
@thst-nordic
Copy link
Contributor Author

@nicu1989 This is ready to merge, just need a +1

@thst-nordic
Copy link
Contributor Author

thst-nordic commented Oct 16, 2025

@carlescufi and @tejlmand both approved the previous PR.
#24571
so I will merge.

@thst-nordic thst-nordic merged commit 77a4a6c into nrfconnect:main Oct 16, 2025
23 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants