Skip to content

Commit 8e356f4

Browse files
pks-tpks-t
committed
azure: explicitly specify CMake generator
We currently specify the CMake generator as part of the CMAKE_OPTIONS variable. This is fine in the current setup, but during the conversion to drop PowerShell scripts this will prove problematic for all generators that have spaces in their names due to quoting issues. Convert to use an explicit CMAKE_GENERATOR variable that makes it easier to get quoting right.
1 parent 443df2d commit 8e356f4

File tree

4 files changed

+35
-13
lines changed

4 files changed

+35
-13
lines changed

‎azure-pipelines.yml‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
imageName: 'libgit2/trusty-amd64:latest'
1717
environmentVariables: |
1818
CC=gcc
19+
CMAKE_GENERATOR=Unix Makefiles
1920
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
2021
2122
- job: linux_amd64_trusty_gcc_mbedtls
@@ -28,6 +29,7 @@ jobs:
2829
imageName: 'libgit2/trusty-amd64:latest'
2930
environmentVariables: |
3031
CC=gcc
32+
CMAKE_GENERATOR=Unix Makefiles
3133
CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
3234
3335
- job: linux_amd64_trusty_clang_openssl
@@ -40,6 +42,7 @@ jobs:
4042
imageName: 'libgit2/trusty-amd64:latest'
4143
environmentVariables: |
4244
CC=clang
45+
CMAKE_GENERATOR=Unix Makefiles
4346
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
4447
4548
- job: linux_amd64_trusty_clang_mbedtls
@@ -52,6 +55,7 @@ jobs:
5255
imageName: 'libgit2/trusty-amd64:latest'
5356
environmentVariables: |
5457
CC=clang
58+
CMAKE_GENERATOR=Unix Makefiles
5559
CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
5660
5761
- job: macos
@@ -66,7 +70,8 @@ jobs:
6670
environmentVariables:
6771
TMPDIR: $(Agent.TempDirectory)
6872
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
69-
CMAKE_OPTIONS: -G Ninja -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks
73+
CMAKE_GENERATOR: Ninja
74+
CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks
7075
SKIP_SSH_TESTS: true
7176

7277
- job: windows_vs_amd64
@@ -76,7 +81,8 @@ jobs:
7681
- template: azure-pipelines/powershell.yml
7782
parameters:
7883
environmentVariables:
79-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" -DDEPRECATE_HARD=ON
84+
CMAKE_GENERATOR: Visual Studio 12 2013 Win64
85+
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
8086

8187
- job: windows_vs_x86
8288
displayName: 'Windows (x86; Visual Studio)'
@@ -85,7 +91,8 @@ jobs:
8591
- template: azure-pipelines/powershell.yml
8692
parameters:
8793
environmentVariables:
88-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
94+
CMAKE_GENERATOR: Visual Studio 12 2013
95+
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
8996

9097
- job: windows_mingw_amd64
9198
displayName: 'Windows (amd64; MinGW)'
@@ -100,7 +107,8 @@ jobs:
100107
parameters:
101108
environmentVariables:
102109
BUILD_PATH: $(Agent.TempDirectory)\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
103-
CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
110+
CMAKE_GENERATOR: MinGW Makefiles
111+
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
104112

105113
- job: windows_mingw_x86
106114
displayName: 'Windows (x86; MinGW)'
@@ -116,7 +124,8 @@ jobs:
116124
parameters:
117125
environmentVariables:
118126
BUILD_PATH: $(Agent.TempDirectory)\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
119-
CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
127+
CMAKE_GENERATOR: MinGW Makefiles
128+
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
120129

121130
- job: documentation
122131
displayName: 'Generate Documentation'

‎azure-pipelines/build.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Write-Host "####################################################################
1818
Write-Host "## Configuring build environment"
1919
Write-Host "##############################################################################"
2020

21-
Invoke-Expression "cmake ${SourceDirectory} -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -DENABLE_WERROR=ON ${Env:CMAKE_OPTIONS}"
21+
Invoke-Expression "cmake ${SourceDirectory} -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -DENABLE_WERROR=ON -G '${Env:CMAKE_GENERATOR}' ${Env:CMAKE_OPTIONS}"
2222
if ($LastExitCode -ne 0) { [Environment]::Exit($LastExitCode) }
2323

2424
Write-Host ""

‎azure-pipelines/build.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ echo "##########################################################################
4242
echo "## Configuring build environment"
4343
echo "##############################################################################"
4444

45-
echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS}
46-
env PATH="$BUILD_PATH" "$CMAKE" ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON ${CMAKE_OPTIONS}
45+
echo cmake ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -G \"${CMAKE_GENERATOR}\" ${CMAKE_OPTIONS}
46+
env PATH="$BUILD_PATH" "$CMAKE" ${SOURCE_DIR} -DENABLE_WERROR=ON -DBUILD_EXAMPLES=ON -DBUILD_FUZZERS=ON -DUSE_STANDALONE_FUZZERS=ON -G "${CMAKE_GENERATOR}" ${CMAKE_OPTIONS}
4747

4848
echo ""
4949
echo "##############################################################################"

‎azure-pipelines/nightly.yml‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ jobs:
1212
imageName: 'libgit2/trusty-amd64:latest'
1313
environmentVariables: |
1414
CC=gcc
15+
CMAKE_GENERATOR=Unix Makefiles
1516
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DREGEX_BACKEND=builtin -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
1617
RUN_INVASIVE_TESTS=true
1718
@@ -25,6 +26,7 @@ jobs:
2526
imageName: 'libgit2/trusty-amd64:latest'
2627
environmentVariables: |
2728
CC=gcc
29+
CMAKE_GENERATOR=Unix Makefiles
2830
CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
2931
RUN_INVASIVE_TESTS=true
3032
@@ -38,6 +40,7 @@ jobs:
3840
imageName: 'libgit2/trusty-amd64:latest'
3941
environmentVariables: |
4042
CC=clang
43+
CMAKE_GENERATOR=Unix Makefiles
4144
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
4245
RUN_INVASIVE_TESTS=true
4346
@@ -51,6 +54,7 @@ jobs:
5154
imageName: 'libgit2/trusty-amd64:latest'
5255
environmentVariables: |
5356
CC=clang
57+
CMAKE_GENERATOR=Unix Makefiles
5458
CMAKE_OPTIONS=-DUSE_HTTPS=mbedTLS -DUSE_SHA1=HTTPS -DREGEX_BACKEND=pcre -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
5559
RUN_INVASIVE_TESTS=true
5660
@@ -66,7 +70,8 @@ jobs:
6670
environmentVariables:
6771
TMPDIR: $(Agent.TempDirectory)
6872
PKG_CONFIG_PATH: /usr/local/opt/openssl/lib/pkgconfig
69-
CMAKE_OPTIONS: -G Ninja -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks
73+
CMAKE_GENERATOR: Ninja
74+
CMAKE_OPTIONS: -DREGEX_BACKEND=regcomp_l -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=leaks
7075
RUN_INVASIVE_TESTS: true
7176
SKIP_SSH_TESTS: true
7277

@@ -77,7 +82,8 @@ jobs:
7782
- template: powershell.yml
7883
parameters:
7984
environmentVariables:
80-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013 Win64" -DDEPRECATE_HARD=ON
85+
CMAKE_GENERATOR: Visual Studio 12 2013 Win64
86+
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON
8187
RUN_INVASIVE_TESTS: true
8288

8389
- job: windows_vs_x86
@@ -87,7 +93,8 @@ jobs:
8793
- template: powershell.yml
8894
parameters:
8995
environmentVariables:
90-
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -G"Visual Studio 12 2013" -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
96+
CMAKE_GENERATOR: Visual Studio 12 2013
97+
CMAKE_OPTIONS: -DMSVC_CRTDBG=ON -DDEPRECATE_HARD=ON -DUSE_SHA1=HTTPS
9198
RUN_INVASIVE_TESTS: true
9299

93100
- job: windows_mingw_amd64
@@ -103,7 +110,8 @@ jobs:
103110
parameters:
104111
environmentVariables:
105112
BUILD_PATH: $(Agent.TempDirectory)\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
106-
CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
113+
CMAKE_GENERATOR: MinGW Makefiles
114+
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
107115
RUN_INVASIVE_TESTS: true
108116

109117
- job: windows_mingw_x86
@@ -120,7 +128,8 @@ jobs:
120128
parameters:
121129
environmentVariables:
122130
BUILD_PATH: $(Agent.TempDirectory)\mingw32\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Program Files (x86)\CMake\bin
123-
CMAKE_OPTIONS: -G"MinGW Makefiles" -DDEPRECATE_HARD=ON
131+
CMAKE_GENERATOR: MinGW Makefiles
132+
CMAKE_OPTIONS: -DDEPRECATE_HARD=ON
124133
RUN_INVASIVE_TESTS: true
125134

126135
- job: linux_x86_bionic_gcc_openssl
@@ -134,6 +143,7 @@ jobs:
134143
imageName: 'libgit2/bionic-x86:latest'
135144
environmentVariables: |
136145
CC=gcc
146+
CMAKE_GENERATOR=Unix Makefiles
137147
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
138148
RUN_INVASIVE_TESTS=true
139149
@@ -148,6 +158,7 @@ jobs:
148158
imageName: 'libgit2/bionic-x86:latest'
149159
environmentVariables: |
150160
CC=clang
161+
CMAKE_GENERATOR=Unix Makefiles
151162
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON -DUSE_LEAK_CHECKER=valgrind
152163
RUN_INVASIVE_TESTS=true
153164
@@ -162,6 +173,7 @@ jobs:
162173
imageName: 'libgit2/bionic-arm32:latest'
163174
environmentVariables: |
164175
CC=gcc
176+
CMAKE_GENERATOR=Unix Makefiles
165177
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
166178
RUN_INVASIVE_TESTS=true
167179
SKIP_PROXY_TESTS=true
@@ -177,6 +189,7 @@ jobs:
177189
imageName: 'libgit2/bionic-arm64:latest'
178190
environmentVariables: |
179191
CC=gcc
192+
CMAKE_GENERATOR=Unix Makefiles
180193
CMAKE_OPTIONS=-DUSE_HTTPS=OpenSSL -DDEPRECATE_HARD=ON
181194
RUN_INVASIVE_TESTS=true
182195
SKIP_PROXY_TESTS=true

0 commit comments

Comments
 (0)