Skip to content

Commit 7687948

Browse files
ethomsonethomson
authored
Merge pull request libgit2#6112 from libgit2/ethomson/cmake3
cmake refactorings
2 parents 42205e7 + 4e84ddd commit 7687948

20 files changed

+422
-428
lines changed

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,30 +91,30 @@ jobs:
9191
env:
9292
CC: gcc
9393
CMAKE_GENERATOR: Ninja
94-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DDEBUG_STRICT_ALLOC=ON -DDEBUG_STRICT_OPEN=ON
94+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON -DDEBUG_STRICT_ALLOC=ON -DDEBUG_STRICT_OPEN=ON
9595
os: ubuntu-latest
9696
- # Xenial, GCC, mbedTLS
9797
container:
9898
name: xenial
9999
env:
100100
CC: gcc
101101
CMAKE_GENERATOR: Ninja
102-
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
102+
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
103103
os: ubuntu-latest
104104
- # Xenial, Clang, OpenSSL
105105
container:
106106
name: xenial
107107
env:
108108
CC: clang
109109
CMAKE_GENERATOR: Ninja
110-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
110+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
111111
os: ubuntu-latest
112112
- # Xenial, Clang, mbedTLS
113113
container:
114114
name: xenial
115115
env:
116116
CC: clang
117-
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
117+
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
118118
CMAKE_GENERATOR: Ninja
119119
os: ubuntu-latest
120120
- # Focal, Clang 10, mbedTLS, MemorySanitizer
@@ -123,7 +123,7 @@ jobs:
123123
env:
124124
CC: clang-10
125125
CFLAGS: -fsanitize=memory -fsanitize-memory-track-origins=2 -fsanitize-blacklist=/home/libgit2/source/script/sanitizers.supp -fno-optimize-sibling-calls -fno-omit-frame-pointer
126-
CMAKE_OPTIONS: -DCMAKE_PREFIX_PATH=/usr/local/msan -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON
126+
CMAKE_OPTIONS: -DCMAKE_PREFIX_PATH=/usr/local/msan -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON -DUSE_SSH=ON
127127
CMAKE_GENERATOR: Ninja
128128
SKIP_SSH_TESTS: true
129129
SKIP_NEGOTIATE_TESTS: true
@@ -136,7 +136,7 @@ jobs:
136136
env:
137137
CC: clang-10
138138
CFLAGS: -fsanitize=undefined,nullability -fno-sanitize-recover=undefined,nullability -fsanitize-blacklist=/home/libgit2/source/script/sanitizers.supp -fno-optimize-sibling-calls -fno-omit-frame-pointer
139-
CMAKE_OPTIONS: -DCMAKE_PREFIX_PATH=/usr/local -DUSE_HTTPS=OpenSSL -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON
139+
CMAKE_OPTIONS: -DCMAKE_PREFIX_PATH=/usr/local -DUSE_HTTPS=OpenSSL -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON -DUSE_SSH=ON
140140
CMAKE_GENERATOR: Ninja
141141
SKIP_SSH_TESTS: true
142142
SKIP_NEGOTIATE_TESTS: true
@@ -149,7 +149,7 @@ jobs:
149149
env:
150150
CC: clang-10
151151
CFLAGS: -fsanitize=thread -fno-optimize-sibling-calls -fno-omit-frame-pointer
152-
CMAKE_OPTIONS: -DCMAKE_PREFIX_PATH=/usr/local -DUSE_HTTPS=OpenSSL -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON
152+
CMAKE_OPTIONS: -DCMAKE_PREFIX_PATH=/usr/local -DUSE_HTTPS=OpenSSL -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_BUNDLED_ZLIB=ON -DUSE_SSH=ON
153153
CMAKE_GENERATOR: Ninja
154154
SKIP_SSH_TESTS: true
155155
SKIP_NEGOTIATE_TESTS: true

‎.github/workflows/nightly.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,46 +25,46 @@ jobs:
2525
env:
2626
CC: gcc
2727
CMAKE_GENERATOR: Ninja
28-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
28+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
2929
os: ubuntu-latest
3030
- # Xenial, GCC, mbedTLS
3131
container:
3232
name: xenial
3333
env:
3434
CC: gcc
3535
CMAKE_GENERATOR: Ninja
36-
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
36+
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
3737
os: ubuntu-latest
3838
- # Xenial, Clang, OpenSSL
3939
container:
4040
name: xenial
4141
env:
4242
CC: clang
4343
CMAKE_GENERATOR: Ninja
44-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
44+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
4545
os: ubuntu-latest
4646
- # Xenial, Clang, mbedTLS
4747
container:
4848
name: xenial
4949
env:
5050
CC: clang
51-
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
51+
CMAKE_OPTIONS: -DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
5252
CMAKE_GENERATOR: Ninja
5353
os: ubuntu-latest
5454
- # Xenial, GCC, thread-free
5555
container:
5656
name: xenial
5757
env:
5858
CC: gcc
59-
CMAKE_OPTIONS: -DTHREADSAFE=OFF -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
59+
CMAKE_OPTIONS: -DTHREADSAFE=OFF -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
6060
CMAKE_GENERATOR: Ninja
6161
os: ubuntu-latest
6262
- # Xenial, Clang, OpenSSL (dynamically loaded)
6363
container:
6464
name: xenial
6565
env:
6666
CC: clang
67-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
67+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
6868
CMAKE_GENERATOR: Ninja
6969
os: ubuntu-latest
7070
- # Focal, Clang 10, mbedTLS, MemorySanitizer
@@ -119,15 +119,15 @@ jobs:
119119
container:
120120
name: centos7
121121
env:
122-
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
122+
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
123123
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
124124
SKIP_NEGOTIATE_TESTS: true
125125
os: ubuntu-latest
126126
- # CentOS 7, OpenSSL (dynamically loaded)
127127
container:
128128
name: centos7
129129
env:
130-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
130+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
131131
PKG_CONFIG_PATH: /usr/local/lib/pkgconfig
132132
SKIP_NEGOTIATE_TESTS: true
133133
os: ubuntu-latest
@@ -212,7 +212,7 @@ jobs:
212212
env:
213213
CC: gcc
214214
CMAKE_GENERATOR: Ninja
215-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
215+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL-Dynamic -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
216216
RUN_INVASIVE_TESTS: true
217217
os: ubuntu-latest
218218
- # Bionic, x86, Clang, OpenSSL
@@ -223,7 +223,7 @@ jobs:
223223
env:
224224
CC: clang
225225
CMAKE_GENERATOR: Ninja
226-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
226+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
227227
RUN_INVASIVE_TESTS: true
228228
os: ubuntu-latest
229229
- # Bionic, x86, GCC, OpenSSL
@@ -233,7 +233,7 @@ jobs:
233233
env:
234234
CC: gcc
235235
CMAKE_GENERATOR: Ninja
236-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON
236+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind -DUSE_GSSAPI=ON -DUSE_SSH=ON
237237
RUN_INVASIVE_TESTS: true
238238
os: ubuntu-latest
239239
- # Bionic, arm32, GCC, OpenSSL
@@ -244,7 +244,7 @@ jobs:
244244
env:
245245
CC: gcc
246246
CMAKE_GENERATOR: Ninja
247-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON
247+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON -DUSE_SSH=ON
248248
RUN_INVASIVE_TESTS: true
249249
SKIP_PROXY_TESTS: true
250250
os: ubuntu-latest
@@ -256,7 +256,7 @@ jobs:
256256
env:
257257
CC: gcc
258258
CMAKE_GENERATOR: Ninja
259-
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON
259+
CMAKE_OPTIONS: -DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_GSSAPI=ON -DUSE_SSH=ON
260260
RUN_INVASIVE_TESTS: true
261261
SKIP_PROXY_TESTS: true
262262
os: ubuntu-latest

0 commit comments

Comments
 (0)