Skip to content

Commit b8fc499

Browse files
committed
remove pre-release
1 parent afc2fea commit b8fc499

1 file changed

Lines changed: 2 additions & 23 deletions

File tree

‎slc/sl_setup_env.py‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
* - Ninja Build System
1717
* - Simplicity Commander
1818
* - SLT CLI (Silicon Labs Tools Command Line Interface)
19-
* - Pre-release Use Pre-release Server (Silicon Labs Pre-release Server, internal use only)
2019
*
2120
* @section usage Usage
2221
* @code{.sh}
@@ -60,17 +59,15 @@
6059
class MatterEnvSetup:
6160
"""Class for setting up the Matter development environment with all required tools."""
6261

63-
def __init__(self, verbose=False, clean_reinstall=False, pre_release=False):
62+
def __init__(self, verbose=False, clean_reinstall=False):
6463
"""Initialize MatterEnvSetup instance.
6564
6665
Args:
6766
verbose: Enable verbose (debug) logging if True
6867
clean_reinstall: If True, remove slc/tools before setup (fresh tool install)
69-
pre_release: If True, use Pre-release Server
7068
"""
7169
self.verbose = verbose
7270
self.clean_reinstall = clean_reinstall
73-
self.pre_release = pre_release
7471
os.environ["SLT_CI"] = "true"
7572
self.setup_logging()
7673
self.set_root_paths()
@@ -325,21 +322,6 @@ def install_tools(self, tool):
325322
logging.info(f"{tool} = {tool_dir}")
326323
return tool_dir
327324

328-
def setup_pre_release(self):
329-
"""Setup Pre-release Server."""
330-
logging.info("Setting up Pre-release Server")
331-
332-
conan_path = self.install_tools("conan")
333-
if not conan_path:
334-
logging.error("Failed to install conan")
335-
sys.exit(1)
336-
conan_path = os.path.join(conan_path, "conan","conan")
337-
try:
338-
subprocess.run([conan_path, "remote", "add", "silabs-conan-prerelease", "https://conan-prerelease.silabs.net/"], check=True)
339-
except subprocess.CalledProcessError as e:
340-
logging.error(f"Failed to setup Pre-release Server: {e}")
341-
sys.exit(1)
342-
343325
def _make_executable(self, path):
344326
"""Make a file executable on Unix-like systems."""
345327
if path and os.path.exists(path):
@@ -369,24 +351,21 @@ def run_setup(self):
369351
self.remove_tools_directory()
370352
self.sync_submodules()
371353
self.download_and_extract_slt_cli()
372-
if self.pre_release:
373-
self.setup_pre_release()
374354
self.setup_tools()
375355
self.write_env_file()
376356
logging.info("\nEnvironment setup completed successfully")
377357

378358
def main():
379359
parser = argparse.ArgumentParser(description="Setup environment for Matter project using Silicon Labs Configurator.")
380360
parser.add_argument('-v', '--verbose', action='store_true', help='Enable verbose (debug) logging')
381-
parser.add_argument('-pr', '--pre-release', action='store_true', help='Use Pre-release Server')
382361
parser.add_argument(
383362
'-c',
384363
'--clean-reinstall',
385364
action='store_true',
386365
help='Remove slc/tools then run a full tool setup',
387366
)
388367
args = parser.parse_args()
389-
env_setup = MatterEnvSetup(verbose=args.verbose, clean_reinstall=args.clean_reinstall, pre_release=args.pre_release)
368+
env_setup = MatterEnvSetup(verbose=args.verbose, clean_reinstall=args.clean_reinstall)
390369
env_setup.run_setup()
391370

392371

0 commit comments

Comments
 (0)