aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Neto <dneto@google.com>2023-01-11 15:24:34 -0500
committerGitHub <noreply@github.com>2023-01-11 15:24:34 -0500
commitbfd278617c3a7b59c0c4b33cdd0213ddfbb38d02 (patch)
tree9f66e5b2ad1261b2f683cc71ea883f8e048fbfba
parent631f9bcb5e664c62cb0f41a01354753996824ba9 (diff)
downloadspirv-tools-bfd278617c3a7b59c0c4b33cdd0213ddfbb38d02.tar.gz
utils: repos use 'main' as main devlopment branch (#5054)
roll_deps.h: SPIRV-Headers uses 'main' check_code_format.h: SPIRV-Tools uses 'main'
-rwxr-xr-xutils/check_code_format.sh2
-rwxr-xr-xutils/roll_deps.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/check_code_format.sh b/utils/check_code_format.sh
index 79947402..da5e0198 100755
--- a/utils/check_code_format.sh
+++ b/utils/check_code_format.sh
@@ -18,7 +18,7 @@
#
# This script assumes to be invoked at the project root directory.
-BASE_BRANCH=${1:-master}
+BASE_BRANCH=${1:-main}
FILES_TO_CHECK=$(git diff --name-only ${BASE_BRANCH} | grep -E ".*\.(cpp|cc|c\+\+|cxx|c|h|hpp)$")
diff --git a/utils/roll_deps.sh b/utils/roll_deps.sh
index 20c061fd..03bdaceb 100755
--- a/utils/roll_deps.sh
+++ b/utils/roll_deps.sh
@@ -27,7 +27,7 @@ googletest_trunk="origin/main"
re2_dir="external/re2/"
re2_trunk="origin/main"
spirv_headers_dir="external/spirv-headers/"
-spirv_headers_trunk="origin/master"
+spirv_headers_trunk="origin/main"
# This script assumes it's parent directory is the repo root.
repo_path=$(dirname "$0")/..