diff options
| author | Ben Clayton <bclayton@google.com> | 2023-01-30 14:39:19 +0000 |
|---|---|---|
| committer | Ben Clayton <bclayton@google.com> | 2023-01-30 14:39:19 +0000 |
| commit | b87a39806281753a52398c9ae1e544826514c2b4 (patch) | |
| tree | c46712fb30a61c11bcfd693baccde65246a292fc | |
| parent | aae98adc2222dcada4aa952cccad48ab08e34004 (diff) | |
| download | swiftshader-b87a39806281753a52398c9ae1e544826514c2b4.tar.gz | |
Update primary branch name for SPIR-V repos
`master` -> `main`.
Bug: none
Change-Id: I82e5c774588692452f2ede04516dc0905f4d22eb
| -rwxr-xr-x | third_party/update-spirvheaders.sh | 2 | ||||
| -rwxr-xr-x | third_party/update-spirvtools.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/update-spirvheaders.sh b/third_party/update-spirvheaders.sh index 9985238c9..d1fc418c5 100755 --- a/third_party/update-spirvheaders.sh +++ b/third_party/update-spirvheaders.sh @@ -10,7 +10,7 @@ if [ ! -z "$REASON" ]; then REASON="\n$REASON\n" fi -git subtree pull --prefix third_party/SPIRV-Headers https://github.com/KhronosGroup/SPIRV-Headers master --squash -m "Update SPIR-V Headers" +git subtree pull --prefix third_party/SPIRV-Headers https://github.com/KhronosGroup/SPIRV-Headers main --squash -m "Update SPIR-V Headers" ALL_CHANGES=`git log -n 1 HEAD^2 | egrep '^(\s{4}[0-9a-f]{9}\s*.*)$'` HEAD_CHANGE=`echo "$ALL_CHANGES" | egrep '[0-9a-f]{9}' -o -m 1` diff --git a/third_party/update-spirvtools.sh b/third_party/update-spirvtools.sh index 931fe98d9..0cd19c082 100755 --- a/third_party/update-spirvtools.sh +++ b/third_party/update-spirvtools.sh @@ -12,7 +12,7 @@ fi THIRD_PARTY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )" -GIT_RESULT=`git subtree pull --prefix third_party/SPIRV-Tools https://github.com/KhronosGroup/SPIRV-Tools master --squash -m "Update SPIR-V Tools"` +GIT_RESULT=`git subtree pull --prefix third_party/SPIRV-Tools https://github.com/KhronosGroup/SPIRV-Tools main --squash -m "Update SPIR-V Tools"` if [[ $GIT_RESULT == *"CONFLICT"* ]]; then echo "subtree pull resulted in conflicts. Atempting to automatically resolve..." # CONFLICT is very likely due to Android.mk being deleted in our third_party. |