Skip to content

Commit 69e00c6

Browse files
authored
Make googletest not be a git submodule, and instead clone it separately in the CI script (AngusJohnson#745)
1 parent 3e3e3dc commit 69e00c6

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

.github/workflows/actions_cpp.yml

+18-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ jobs:
1111
with:
1212
node-version: '16'
1313
- name: Get GoogleTest
14-
run: git submodule update --init
14+
run: |
15+
cd CPP/Tests
16+
git clone https://github.com/google/googletest
1517
- name: Add MSBuild to PATH
1618
uses: microsoft/[email protected]
1719
- name: Build
@@ -32,7 +34,9 @@ jobs:
3234
with:
3335
node-version: '16'
3436
- name: Get GoogleTest
35-
run: git submodule update --init
37+
run: |
38+
cd CPP/Tests
39+
git clone https://github.com/google/googletest
3640
- name: Build
3741
run: |
3842
mkdir CPP/build
@@ -51,7 +55,9 @@ jobs:
5155
with:
5256
node-version: '16'
5357
- name: Get GoogleTest
54-
run: git submodule update --init
58+
run: |
59+
cd CPP/Tests
60+
git clone https://github.com/google/googletest
5561
- name: Install gcc 11
5662
run: |
5763
sudo apt update
@@ -75,7 +81,9 @@ jobs:
7581
with:
7682
node-version: '16'
7783
- name: Get GoogleTest
78-
run: git submodule update --init
84+
run: |
85+
cd CPP/Tests
86+
git clone https://github.com/google/googletest
7987
- name: Build
8088
run: |
8189
export CC=/usr/bin/clang
@@ -96,7 +104,9 @@ jobs:
96104
with:
97105
node-version: '16'
98106
- name: Get GoogleTest
99-
run: git submodule update --init
107+
run: |
108+
cd CPP/Tests
109+
git clone https://github.com/google/googletest
100110
- name: Install clang 13
101111
run: |
102112
wget https://apt.llvm.org/llvm.sh
@@ -122,7 +132,9 @@ jobs:
122132
with:
123133
node-version: '16'
124134
- name: Get GoogleTest
125-
run: git submodule update --init
135+
run: |
136+
cd CPP/Tests
137+
git clone https://github.com/google/googletest
126138
- name: Build
127139
run: |
128140
mkdir CPP/build

.gitmodules

-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
[submodule "CPP/Tests/googletest"]
2-
path = CPP/Tests/googletest
3-
url = https://github.com/google/googletest

CPP/Tests/googletest

-1
This file was deleted.

0 commit comments

Comments
 (0)