From c757a2a8f8d1ef46e5f11e9308f1d5c7cd3bb8a3 Mon Sep 17 00:00:00 2001 From: Juan Ramos Date: Mon, 16 Jan 2023 16:10:30 -0700 Subject: github: Use main instead of master closes #729 --- scripts/check_code_format.sh | 4 ++-- scripts/update_deps.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/check_code_format.sh b/scripts/check_code_format.sh index 216da478..dbd7b799 100755 --- a/scripts/check_code_format.sh +++ b/scripts/check_code_format.sh @@ -24,14 +24,14 @@ NC='\033[0m' # No Color clang-format --version -FILES_TO_CHECK=$(git diff --name-only master | grep -v -E "^include/vulkan" | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$") +FILES_TO_CHECK=$(git diff --name-only main | grep -v -E "^include/vulkan" | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$") if [ -z "${FILES_TO_CHECK}" ]; then echo -e "${GREEN}No source code to check for formatting.${NC}" exit 0 fi -FORMAT_DIFF=$(git diff -U0 master -- ${FILES_TO_CHECK} | python ./scripts/clang-format-diff.py -p1 -style=file) +FORMAT_DIFF=$(git diff -U0 main -- ${FILES_TO_CHECK} | python ./scripts/clang-format-diff.py -p1 -style=file) if [ -z "${FORMAT_DIFF}" ]; then echo -e "${GREEN}All source code in PR properly formatted.${NC}" diff --git a/scripts/update_deps.py b/scripts/update_deps.py index f892be0a..ff09871b 100755 --- a/scripts/update_deps.py +++ b/scripts/update_deps.py @@ -619,7 +619,7 @@ def main(): '--ref', dest='ref', default='', - help="Override 'commit' with git reference. E.g., 'origin/master'") + help="Override 'commit' with git reference. E.g., 'origin/main'") parser.add_argument( '--no-build', dest='do_build', -- cgit v1.2.3