From 663d050a98415370ab112396e53852cd5e62ebef Mon Sep 17 00:00:00 2001 From: Alastair Donaldson Date: Fri, 16 Oct 2020 14:58:35 +0100 Subject: [PATCH] Temporary fix to make GoogleTest compile. (#3922) --- .appveyor.yml | 3 ++- kokoro/android/build.sh | 3 ++- kokoro/check-format/build.sh | 3 ++- kokoro/linux-clang-release-bazel/build.sh | 3 ++- kokoro/macos-clang-release-bazel/build.sh | 3 ++- kokoro/ndk-build/build.sh | 3 ++- kokoro/scripts/linux/build.sh | 3 ++- kokoro/scripts/macos/build.sh | 3 ++- kokoro/scripts/windows/build.bat | 3 ++- kokoro/windows-msvc-2015-release-bazel/build.bat | 3 ++- 10 files changed, 20 insertions(+), 10 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 77cd89c9..0a4cca05 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -46,7 +46,8 @@ install: before_build: - git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers.git external/spirv-headers - - git clone --depth=1 https://github.com/google/googletest.git external/googletest + - git clone https://github.com/google/googletest.git external/googletest + - cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. - git clone --depth=1 https://github.com/google/effcee.git external/effcee - git clone --depth=1 https://github.com/google/re2.git external/re2 # Set path and environment variables for the current Visual Studio version diff --git a/kokoro/android/build.sh b/kokoro/android/build.sh index c5a0a875..c05c139a 100644 --- a/kokoro/android/build.sh +++ b/kokoro/android/build.sh @@ -35,7 +35,8 @@ export TOOLCHAIN_PATH=$PWD/android-cmake/android.toolchain.cmake cd $SRC git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 diff --git a/kokoro/check-format/build.sh b/kokoro/check-format/build.sh index 2a8d50fb..0c4b8d1c 100644 --- a/kokoro/check-format/build.sh +++ b/kokoro/check-format/build.sh @@ -31,7 +31,8 @@ export PATH=$PWD/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin:$PATH cd $SRC git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 curl -L http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format/clang-format-diff.py -o utils/clang-format-diff.py; diff --git a/kokoro/linux-clang-release-bazel/build.sh b/kokoro/linux-clang-release-bazel/build.sh index cc38bd4a..05a9bbb4 100644 --- a/kokoro/linux-clang-release-bazel/build.sh +++ b/kokoro/linux-clang-release-bazel/build.sh @@ -26,7 +26,8 @@ SRC=$PWD/github/SPIRV-Tools cd $SRC git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 diff --git a/kokoro/macos-clang-release-bazel/build.sh b/kokoro/macos-clang-release-bazel/build.sh index e92fa74e..d2a516f5 100644 --- a/kokoro/macos-clang-release-bazel/build.sh +++ b/kokoro/macos-clang-release-bazel/build.sh @@ -26,7 +26,8 @@ SRC=$PWD/github/SPIRV-Tools cd $SRC git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 diff --git a/kokoro/ndk-build/build.sh b/kokoro/ndk-build/build.sh index d51f071e..f1f167d8 100644 --- a/kokoro/ndk-build/build.sh +++ b/kokoro/ndk-build/build.sh @@ -34,7 +34,8 @@ export ANDROID_NDK=/opt/android-ndk-r15c # Get the dependencies. cd $SRC git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 diff --git a/kokoro/scripts/linux/build.sh b/kokoro/scripts/linux/build.sh index 606051f2..347f353a 100644 --- a/kokoro/scripts/linux/build.sh +++ b/kokoro/scripts/linux/build.sh @@ -68,7 +68,8 @@ export PATH="$PWD:$PATH" cd $SRC git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 git clone --depth=1 --branch v3.13.0 https://github.com/protocolbuffers/protobuf external/protobuf diff --git a/kokoro/scripts/macos/build.sh b/kokoro/scripts/macos/build.sh index 659ba53a..44c9a412 100644 --- a/kokoro/scripts/macos/build.sh +++ b/kokoro/scripts/macos/build.sh @@ -32,7 +32,8 @@ export PATH="$PWD:$PATH" cd $SRC git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 git clone --depth=1 --branch v3.13.0 https://github.com/protocolbuffers/protobuf external/protobuf diff --git a/kokoro/scripts/windows/build.bat b/kokoro/scripts/windows/build.bat index 9adf525c..fa7a71a0 100644 --- a/kokoro/scripts/windows/build.bat +++ b/kokoro/scripts/windows/build.bat @@ -26,7 +26,8 @@ set PATH=C:\python36;%PATH% cd %SRC% git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2 git clone --depth=1 --branch v3.13.0 https://github.com/protocolbuffers/protobuf external/protobuf diff --git a/kokoro/windows-msvc-2015-release-bazel/build.bat b/kokoro/windows-msvc-2015-release-bazel/build.bat index ddb4f540..2f721af4 100644 --- a/kokoro/windows-msvc-2015-release-bazel/build.bat +++ b/kokoro/windows-msvc-2015-release-bazel/build.bat @@ -24,7 +24,8 @@ set PATH=C:\python36;%PATH% :: Get dependencies cd %SRC% git clone --depth=1 https://github.com/KhronosGroup/SPIRV-Headers external/spirv-headers -git clone --depth=1 https://github.com/google/googletest external/googletest +git clone https://github.com/google/googletest external/googletest +cd external && cd googletest && git reset --hard 1fb1bb23bb8418dc73a5a9a82bbed31dc610fec7 && cd .. && cd .. git clone --depth=1 https://github.com/google/effcee external/effcee git clone --depth=1 https://github.com/google/re2 external/re2