@@ -352,6 +352,8 @@ def create_and_upload_package(Map args = [:]) {
352352 def DEV_REMOTE_URL = " https://artifactory.silabs.net/artifactory/api/conan/matter-conan-dev"
353353 def SQA_REMOTE_NAME = " matter-conan-sqa"
354354 def SQA_REMOTE_URL = " https://artifactory.silabs.net/artifactory/api/conan/matter-conan-sqa"
355+ def SILABS_REMOTE_NAME = " silabs-conan-dev"
356+ def SILABS_REMOTE_URL = " https://artifactory.silabs.net/artifactory/api/conan/silabs-conan-dev"
355357 def SL_PRERELEASE = " ${ REPO_ROOT} /packages/.prerelease"
356358 def SL_PRERELEASE_NUMBER = " " // Initialize prerelease number variable
357359
@@ -375,21 +377,6 @@ def create_and_upload_package(Map args = [:]) {
375377
376378 // Execute the conan action using the reusable function
377379 // executeConanCreatePublishAction(String conanfilePath, String stackName, String remoteUrl, String remoteName, boolean create, boolean publish)
378- echo " Getting the package versions"
379- executeConanCreatePublishAction(MATTER_CONANFILE_PATH , ' matter' , DEV_REMOTE_URL , DEV_REMOTE_NAME , false , false , SL_PRERELEASE )
380-
381- // Extract package information using reusable function
382- def packageInfo = extractPackageInfoFromJson()
383- SL_PRERELEASE_NUMBER = packageInfo. prerelease_number
384- dir(REPO_ROOT ) {
385- echo pwd()
386- // Install required Python dependencies (handle externally managed environment)
387- sh '''
388- # Try system package first, fallback to pip with --break-system-packages
389- apt update && apt install -y python3-yaml || pip3 install --break-system-packages pyyaml
390- '''
391- sh ' make generate_pkg_slt_common'
392- }
393380 echo " Uploading the matter component package"
394381 executeConanCreatePublishAction(MATTER_CONANFILE_PATH , ' matter' , DEV_REMOTE_URL , DEV_REMOTE_NAME , true , true , SL_PRERELEASE )
395382 echo " Uploading the matter app package"
@@ -415,6 +402,12 @@ def create_and_upload_package(Map args = [:]) {
415402 echo " Start promoting matter_app/${ CONAN_PACKAGE_VERSION} to matter-conan-sqa"
416403 executeConanPromoteAction(' matter_app' , DEV_REMOTE_URL , DEV_REMOTE_NAME , SQA_REMOTE_URL , SQA_REMOTE_NAME , CONAN_PACKAGE_VERSION )
417404 echo " Done promoting matter_app/${ CONAN_PACKAGE_VERSION} to matter-conan-sqa"
405+ echo " Start promoting matter/${ CONAN_PACKAGE_VERSION} to silabs-conan-dev"
406+ executeConanPromoteAction(' matter' , SQA_REMOTE_URL , SQA_REMOTE_NAME , SILABS_REMOTE_URL , SILABS_REMOTE_NAME , CONAN_PACKAGE_VERSION )
407+ echo " Done promoting matter/${ CONAN_PACKAGE_VERSION} to silabs-conan-dev"
408+ echo " Start promoting matter_app/${ CONAN_PACKAGE_VERSION} to silabs-conan-dev"
409+ executeConanPromoteAction(' matter_app' , SQA_REMOTE_URL , SQA_REMOTE_NAME , SILABS_REMOTE_URL , SILABS_REMOTE_NAME , CONAN_PACKAGE_VERSION )
410+ echo " Done promoting matter_app/${ CONAN_PACKAGE_VERSION} to silabs-conan-dev"
418411 }
419412
420413 }
0 commit comments