zephyr
/
hal_stm32
mirror of https://github.com/zephyrproject-rtos/hal_stm32.git
1
0
Fork 0
Code Issues Releases Wiki Activity

scripts: serie_update.py: support master and main branches 

https://github.com/STMicroelectronics/STM32CubeWL.git
has main branch instead of master.
So if master doesn't exist use main branch.

Signed-off-by: Alexandre Bourdiol <alexandre.bourdiol@st.com>
This commit is contained in:
Alexandre Bourdiol 2021-06-08 17:32:40 +02:00 committed by Kumar Gala
parent f8ff8d25aa
commit e3e435a80f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/serie_update.py
View File

@ -118,13 +118,23 @@ class Stm32SerieUpdate:
def clone_cube_repo(self):
"""Clone or fetch a stm32 serie repo"""
# check whether master branch exist, otherwise use main branch
master_branch_exist = subprocess.check_output(
"git ls-remote --heads origin master", cwd=self.stm32cube_serie_path
).decode("utf-8")
if master_branch_exist:
branch = "master"
else:
branch = "main"
logging.info("Branch used:" + branch)
if self.stm32cube_serie_path.exists():
logging.info("fetching repo " + str(self.stm32cube_serie_path))
# if already exists, then just clean and fetch
os_cmd(("git", "clean", "-fdx"), cwd=self.stm32cube_serie_path)
os_cmd(("git", "fetch"), cwd=self.stm32cube_serie_path)
os_cmd(
("git", "reset", "--hard", "master"),
("git", "reset", "--hard", branch),
cwd=self.stm32cube_serie_path,
)
else:
@ -135,7 +145,7 @@ class Stm32SerieUpdate:
# get the latest version of cube,
# with the most recent one created being the last entry.
os_cmd(("git", "checkout", "master"), cwd=self.stm32cube_serie_path)
os_cmd(("git", "checkout", branch), cwd=self.stm32cube_serie_path)
self.version_tag = subprocess.check_output(
"git tag -l", cwd=self.stm32cube_serie_path
).splitlines()