MATTER-5591 : Re-arrange slc/sample-apps and slc/solutions under slc/apps #122
Conversation
Sarthak-Shaha
changed the title
slc/apps/platform-app/thread/platform-app-series-2-internal.slcw
Outdated
Show resolved
Hide resolved
slc/apps/zigbee-matter-light/thread/zigbee-matter-light-series-2.slcw
Outdated
Show resolved
Hide resolved
slc/apps/performance-test-app/thread/performance-test-cluster.xml
Outdated
Show resolved
Hide resolved
Sarthak-Shaha
changed the title
|
@Sarthak-Shaha This PR is going to cause conflicts with #121. We should merge the platform apps first and then this one to avoid issues imo. |
There was a problem hiding this comment.
Might be missing a rename to README for this file to match others.
There was a problem hiding this comment.
Intentionally had to add new README for NCPs, they do not share same README as SIWX917
There was a problem hiding this comment.
The name of the README might not be adequate if it is only for NCPs vs SoC
There was a problem hiding this comment.
Should we rename wifi/readme_wifi to wifi/readme_ncp
and wifi/readme to wifi/readme_soc ?
Sarthak-Shaha
force-pushed
the
feature/restructure_apps
branch
from
adecac0 to
c547c3f
Compare
What's the status for #121? This PR has been open for a while now. |
Sarthak-Shaha
force-pushed
the
feature/restructure_apps
branch
from
c547c3f to
34ef3a5
Compare
It is merged - it was blocked on the NCP PR for the build arguments and CI issues. |
Sarthak-Shaha
force-pushed
the
feature/restructure_apps
branch
from
adff44e to
2835893
Compare
Sarthak-Shaha
force-pushed
the
feature/restructure_apps
branch
from
6451549 to
91b55ee
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR reorganizes the Matter sample apps and solutions to improve maintainability and clarity by consolidating all sample apps under slc/apps/ and grouping them by technology (Thread/Wi-Fi) rather than by series or device type.
- Relocated all apps from
slc/sample-app/andslc/solutions/toslc/apps/ - Removed technology-specific suffixes from app names and reorganized workspace files by technology
- Deprecated RS9116-based samples and updated build scripts, metadata generation, and CI workflows
Reviewed Changes
Copilot reviewed 240 out of 291 changed files in this pull request and generated 6 comments.
Show a summary per file
| File | Description |
|---|---|
| slc/solutions//series-/*.slcw | Removed old solution workspace files from previous directory structure |
| slc/solutions//.slt | Removed old package manifest files |
| slc/sample-app//efr32/.slcp | Removed deprecated RS911x sample app configurations |
| slc/sample-app/*/pkg.slt | Removed old package manifests from sample-app directory |
| slc/apps//thread/.slcw | Added new Thread-based workspace files organized by series |
| slc/apps//wifi/.slcw | Added new Wi-Fi-based workspace files with updated naming |
| slc/apps//thread/.slcp | Updated project names to remove technology suffixes |
| slc/apps//wifi/.slcp | Updated project names and README references from README_WiFi.md to README.md |
| slc/apps/*/thread/pkg.slt | Added new package manifests with Matter 2.7.0 dependency |
| slc/build.sh | Updated to handle new directory structure and naming conventions |
| slc/script/generate_metadata.py | Updated README path reference from README_WiFi.md to README.md |
| jenkins_integration/* | Updated build paths and artifact processing for new structure |
| .github/workflows/platform-builder.yaml | Updated workflow paths to reference new app locations |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
slc/apps/air-quality-sensor-app/thread/air-quality-sensor-app-series-2.slcw
Outdated
Show resolved
Hide resolved
| sshagent(['svc_gsdk-ssh']) { | ||
| checkout scm: [$class : 'GitSCM', | ||
| branches : [[name: 'main']], | ||
| branches : [[name: 'matter_github_change_app_names']], |
There was a problem hiding this comment.
Branch name should be changed from the temporary development branch 'matter_github_change_app_names' to the target branch (likely 'main').
| branches : [[name: 'matter_github_change_app_names']], | |
| branches : [[name: 'master']], |
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 239 out of 291 changed files in this pull request and generated 2 comments.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
…series-2.slcw Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Sarthak-Shaha
force-pushed
the
feature/restructure_apps
branch
from
b2a7336 to
5c765fd
Compare
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 235 out of 287 changed files in this pull request and generated 6 comments.
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| sshagent(['svc_gsdk-ssh']) { | ||
| checkout scm: [$class : 'GitSCM', | ||
| branches : [[name: 'main']], | ||
| branches : [[name: 'matter_github_change_app_names']], |
There was a problem hiding this comment.
The branch name is hardcoded to 'matter_github_change_app_names' instead of using the default 'main' or a parameterized branch. This appears to be a temporary change for testing this PR and should be reverted before merging to avoid CI builds always checking out this specific branch.
| branches : [[name: 'matter_github_change_app_names']], | |
| branches : [[name: branchName]], |
Issue Link:
MATTER-5591
Description of Problem/Feature:
This PR reorganizes the sample apps and solutions to improve maintainability and clarity. The goal is to consolidate all sample apps under a unified structure and group them based on their technology dependencies (e.g., Thread, Wi-Fi) and package manager usage.
Description of Fix/Solution:
Folder Structure
Moved all slc/sample-app and slc/solutions under the slc/apps/ directory.
Renaming & Reorganization
Removed technology-specific suffixes from app names:
lighting-app-thread → lighting-app
lighting-app-917-soc -> lighting-app-siwx
Reorganized .slcw files by technology and series:
series-2/thread-internal-bootloader.slcw → thread/series-2-internal.slcw
series-2/thread-bootloader.slcw → thread/series-2.slcw
series-3/thread-bootloader.slcw → thread/series-3.slcw
series-2/wf200-bootloader.slcw → wifi/wf200.slcw
series-2/917-ncp.slcw → wifi/917-ncp.slcw
Renamed README_WIFI.md -> README.md
Updated relevant scripts and metadata as well as the github actions.
Deprecations
Removed RS9116-based samples. See #116
App Grouping
Moved all NCPs under apps/<app_name>/wifi/
Moved all Thread sample apps (Series 2 and Series 3) under apps/<app_name>/thread/
Enable platform app for 917-soc: Disabled again created a follow up bug https://jira.silabs.com/browse/MATTER-5603
Updated platform-917-soc app to match KVS values from config, verified with @lpbeliveau-silabs
Testing Done:
CI
Limited studio testing