Skip to content

Commit c8c6347

Browse files
authored
Prevent update_spirv_deps.sh from updating re2 and effcee. (#5250)
* Prevent update_spirv_deps.sh from updating re2 and effcee. As per discussion in #5246, the repositories re2 and effcee should not be updated when rolling submodules forward. * Also ignore DirectX-Headers submodule updates. * Fix comment to match code.
1 parent 815055b commit c8c6347

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

utils/update_spirv_deps.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@ if [ ! -d external -o ! -d .git -o ! -d azure-pipelines ] ; then
44
exit 1
55
fi
66

7-
set -ex
8-
git submodule foreach 'set -x && git switch main && git pull --ff-only'
7+
# Ignore effcee, re2 and DirectX-Headers updates. See the discussion at
8+
# https://github.com/microsoft/DirectXShaderCompiler/pull/5246
9+
# for details.
10+
git submodule foreach ' \
11+
n=$(basename $sm_path); \
12+
if [ "$n" != "re2" -a "$n" != "effcee" -a "$n" != "DirectX-Headers" ]; \
13+
then git switch main && git pull --ff-only; \
14+
else echo "Skipping submodule $n"; \
15+
fi; \
16+
echo \
17+
'
918
git add external
1019
exit 0

0 commit comments

Comments
 (0)