diff --git a/.ci/build-freebsd.sh b/.ci/build-freebsd.sh index 2d8a3a8ae2..95c00a8733 100755 --- a/.ci/build-freebsd.sh +++ b/.ci/build-freebsd.sh @@ -1,9 +1,9 @@ #!/bin/sh -ex -# Pull all the submodules except llvm +# Pull all the submodules except llvm and opencv # Note: Tried to use git submodule status, but it takes over 20 seconds # shellcheck disable=SC2046 -git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) +git submodule -q update --init --depth 1 $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules) # Prefer newer Clang than in base system (see also .ci/install-freebsd.sh) # libc++ isn't in llvm* packages, so download manually diff --git a/.ci/build-linux-aarch64.sh b/.ci/build-linux-aarch64.sh index 834356c625..a0c4724bff 100644 --- a/.ci/build-linux-aarch64.sh +++ b/.ci/build-linux-aarch64.sh @@ -6,9 +6,9 @@ fi git config --global --add safe.directory '*' -# Pull all the submodules except llvm +# Pull all the submodules except llvm and opencv # shellcheck disable=SC2046 -git submodule -q update --init $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) +git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules) mkdir build && cd build || exit 1 diff --git a/.ci/build-linux.sh b/.ci/build-linux.sh index 9d58d94fc9..e1466d1c01 100755 --- a/.ci/build-linux.sh +++ b/.ci/build-linux.sh @@ -6,10 +6,10 @@ fi git config --global --add safe.directory '*' -# Pull all the submodules except llvm +# Pull all the submodules except llvm and opencv # Note: Tried to use git submodule status, but it takes over 20 seconds # shellcheck disable=SC2046 -git submodule -q update --init $(awk '/path/ && !/llvm/ { print $3 }' .gitmodules) +git submodule -q update --init $(awk '/path/ && !/llvm/ && !/opencv/ { print $3 }' .gitmodules) mkdir build && cd build || exit 1 diff --git a/.ci/build-mac.sh b/.ci/build-mac.sh index 8b0fe08065..dbbb8f8876 100644 --- a/.ci/build-mac.sh +++ b/.ci/build-mac.sh @@ -65,9 +65,9 @@ export VK_ICD_FILENAMES="$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json" export LLVM_DIR LLVM_DIR="BREW_X64_PATH/opt/llvm@$LLVM_COMPILER_VER" -# exclude ffmpeg, LLVM, and sdl from submodule update +# exclude ffmpeg, LLVM, opencv, and sdl from submodule update # shellcheck disable=SC2046 -git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && !/llvm/ && !/SDL/ { print $3 }' .gitmodules) +git submodule -q update --init --depth=1 --jobs=8 $(awk '/path/ && !/ffmpeg/ && !/llvm/ && !/opencv/ && !/SDL/ { print $3 }' .gitmodules) # 3rdparty fixes sed -i '' "s/extern const double NSAppKitVersionNumber;/const double NSAppKitVersionNumber = 1343;/g" 3rdparty/hidapi/hidapi/mac/hid.c