Merge pull request #35 from emiatej9/feature/issue-34

update googletest version to 1.11.0
bab2min · Sep 2, 2021 · 844474e · 844474e
2 parents 0996518 + d59d89c
commit 844474e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/centos5.yml b/.github/workflows/centos5.yml
@@ -15,6 +15,8 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: true
+    - name: Checkout Old Version googletest
+      run: cd third_party/googletest && git checkout v1.8.x && cd ../..
     - name: Configure Build
       run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DKIWI_USE_MIMALLOC=0 ..
     - name: Build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,6 +15,8 @@ jobs:
     - uses: actions/checkout@v1
       with:
         submodules: true
+    - name: Checkout Old Version googletest
+      run: cd third_party/googletest && git checkout v1.8.x && cd ../..
     - name: Configure Build
       run: mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DKIWI_USE_MIMALLOC=0 ..
     - name: Build

diff --git a/.gitmodules b/.gitmodules
@@ -11,4 +11,4 @@
 [submodule "third_party/googletest"]
 	path = third_party/googletest
 	url = https://github.com/google/googletest
-	branch = v1.8.x
+	branch = master
diff --git a/third_party/googletest b/third_party/googletest