Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

matter: include EXTRAVERSION in Matter software version string #17787

Merged
merged 1 commit into from
Oct 21, 2024

Conversation

Damian-Nordic
Copy link
Contributor

Switch the Matter software version string from
APP_VERSION_TWEAK_STRING to APP_VERSION_EXTENDED_STRING.

@Damian-Nordic Damian-Nordic requested a review from a team as a code owner October 9, 2024 13:51
@github-actions github-actions bot added manifest changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 9, 2024
@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 9, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
matter nrfconnect/sdk-connectedhomeip@171a1d3 nrfconnect/sdk-connectedhomeip@731aac5 (master) nrfconnect/[email protected]

Note: This message is automatically posted and updated by the Manifest GitHub Action.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 9, 2024

CI Information

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

Inputs:

Sources:

sdk-nrf: PR head: 51e20dea0bdb5a6c5ce6fd04157e51d76603e08c
matter: PR head: 731aac5c8941bf0f0a9f10c759f533e5b01f80eb

more details

sdk-nrf:

PR head: 51e20dea0bdb5a6c5ce6fd04157e51d76603e08c
merge base: 6d40ee41124cec57a9d9e6e02c51526d99ddbd28
target head (main): cb03c274712841cf90ccb7ee05ffec28a7c584ba
Diff

matter:

PR head: 731aac5c8941bf0f0a9f10c759f533e5b01f80eb
merge base: 171a1d323bf91ac7a655f93c70c18ebb6c1a2253
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)
doc
│  ├── nrf
│  │  ├── protocols
│  │  │  ├── matter
│  │  │  │  ├── end_product
│  │  │  │  │  │ versioning.rst
│  │  ├── releases_and_maturity
│  │  │  ├── releases
│  │  │  │  │ release-notes-changelog.rst
modules
│  ├── lib
│  │  ├── matter
│  │  │  ├── config
│  │  │  │  ├── zephyr
│  │  │  │  │  ├── ota-image.cmake
│  │  │  │  │  │ ota-image_sysbuild.cmake
│  │  │  ├── src
│  │  │  │  ├── platform
│  │  │  │  │  ├── nrfconnect
│  │  │  │  │  │  │ CHIPDevicePlatformConfig.h
west.yml

Outputs:

Toolchain

Version: 3dd8985b56
Build docker image: docker-dtr.nordicsemi.no/sw-production/ncs-build:3dd8985b56_912848a074

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

  • ◻️ Toolchain - Skipped: existing toolchain is used
  • ✅ Build twister
    • sdk-nrf test count: 123
  • ✅ Integration tests
    • ✅ test-fw-nrfconnect-chip
Disabled integration tests
    • desktop52_verification
    • doc-internal
    • test_ble_nrf_config
    • test-fw-nrfconnect-apps
    • test-fw-nrfconnect-ble_mesh
    • test-fw-nrfconnect-ble_samples
    • test-fw-nrfconnect-boot
    • test-fw-nrfconnect-fem
    • test-fw-nrfconnect-nfc
    • test-fw-nrfconnect-nrf-iot_cloud
    • test-fw-nrfconnect-nrf-iot_lwm2m
    • test-fw-nrfconnect-nrf-iot_mosh
    • test-fw-nrfconnect-nrf-iot_nrf_provisioning
    • test-fw-nrfconnect-nrf-iot_positioning
    • 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
    • test-fw-nrfconnect-rpc
    • test-fw-nrfconnect-rs
    • test-fw-nrfconnect-tfm
    • test-fw-nrfconnect-thread
    • test-fw-nrfconnect-zigbee
    • test-low-level
    • test-sdk-audio
    • test-sdk-dfu
    • test-sdk-find-my
    • test-sdk-mcuboot
    • test-sdk-pmic-samples
    • test-sdk-sidewalk
    • test-sdk-wifi
    • test-secdom-samples-public

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

@NordicBuilder
Copy link
Contributor

You can find the documentation preview for this PR at this link. It will be updated about 10 minutes after the documentation build succeeds.

Note: This comment is automatically posted by the Documentation Publishing GitHub Action.

Copy link
Contributor

@LuDuda LuDuda left a comment

Choose a reason for hiding this comment

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

Thank you @Damian-Nordic!

I think we need slightly to modify the documentation here: https://docs.nordicsemi.com/bundle/ncs-latest/page/nrf/protocols/matter/end_product/versioning.html

We did ignore the extra string previously to have parity between BLE and Matter OTA images. Saying this, I think it's better to have an option to define this extra string even though it's not easily doable for BLE.

@doublemis1 could you check if some tests need adjustments?

@Damian-Nordic Damian-Nordic requested review from a team as code owners October 21, 2024 08:52
@github-actions github-actions bot added doc-required PR must not be merged without tech writer approval. and removed changelog-entry-required Update changelog before merge. Remove label if entry is not needed or already added. labels Oct 21, 2024
@NordicBuilder NordicBuilder removed the DNM label Oct 21, 2024
@Damian-Nordic Damian-Nordic requested a review from LuDuda October 21, 2024 08:54
Switch the Matter software version string from
APP_VERSION_TWEAK_STRING to APP_VERSION_EXTENDED_STRING.

Signed-off-by: Damian Krolik <[email protected]>
@rlubos rlubos merged commit 76a27e8 into nrfconnect:main Oct 21, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
doc-required PR must not be merged without tech writer approval. manifest manifest-matter
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants