From 6479b8a0936852c052c16f79606cd1192fc9dcc1 Mon Sep 17 00:00:00 2001 From: Frederic Pillon Date: Tue, 5 Oct 2021 14:31:52 +0200 Subject: [PATCH] ci: update scripts to main branch Signed-off-by: Frederic Pillon --- CI/astyle/astyle.py | 2 +- CI/build/arduino-cli.py | 2 +- CI/utils/fqbn.py | 2 +- CI/utils/stm32variant.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CI/astyle/astyle.py b/CI/astyle/astyle.py index 29ca3c619f..828fa29138 100644 --- a/CI/astyle/astyle.py +++ b/CI/astyle/astyle.py @@ -24,7 +24,7 @@ ignore_path = os.path.join(script_path, ignore_filename) def_path = os.path.join(script_path, def_filename) astyle_out_path = astyle_out_filename -git_branch = "remotes/origin/master" +git_branch = "remotes/origin/main" astyle_major = 3 astyle_minor = 1 diff --git a/CI/build/arduino-cli.py b/CI/build/arduino-cli.py index 144d6a73aa..f13ac2651e 100644 --- a/CI/build/arduino-cli.py +++ b/CI/build/arduino-cli.py @@ -25,7 +25,7 @@ path_config_filename = os.path.join(script_path, "path_config.json") arduino_cli_path = "" -stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/master/package_stmicroelectronics_index.json" +stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json" sketches_path_list = [] default_build_output_dir = os.path.join(tempdir, "build_arduinoCliOutput") build_output_dir = os.path.join(tempdir, "build_arduinoCliOutput" + build_id) diff --git a/CI/utils/fqbn.py b/CI/utils/fqbn.py index 42c134bfeb..71493e213b 100644 --- a/CI/utils/fqbn.py +++ b/CI/utils/fqbn.py @@ -10,7 +10,7 @@ fqbn_list = [] arduino_cli = "" arduino_cli_path = "" -stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/master/package_stmicroelectronics_index.json" +stm32_url = "https://github.com/stm32duino/BoardManagerFiles/raw/main/package_stmicroelectronics_index.json" arduino_platform = "STMicroelectronics:stm32" # Parser diff --git a/CI/utils/stm32variant.py b/CI/utils/stm32variant.py index af3ccdbdc4..a30476011a 100644 --- a/CI/utils/stm32variant.py +++ b/CI/utils/stm32variant.py @@ -2158,7 +2158,7 @@ def manage_repo(): git_cmds = [ ["git", "-C", repo_path, "clean", "-fdx"], ["git", "-C", repo_path, "fetch"], - ["git", "-C", repo_path, "reset", "--hard", "origin/master"], + ["git", "-C", repo_path, "reset", "--hard", "origin/main"], ] else: # Clone it as it does not exists yet