Using built-in cmake when possible

CLIUtils · May 11, 2019 · 6664079 · 6664079
1 parent b8869ef
commit 6664079
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/.ci/azure-steps.yml b/.ci/azure-steps.yml
@@ -5,7 +5,7 @@ steps:
     cmakeArgs: .. -DCLI11_SINGLE_FILE=$(cli11.single) -DCLI11_CXX_STD=$(cli11.std) -DCLI11_SINGLE_FILE_TESTS=$(cli11.single) -DCMAKE_BUILD_TYPE=$(cli11.build_type)
   displayName: 'Configure'
 
-- script: cmake --build . -j
+- script: cmake --build . $(cli11.parallel)
   displayName: 'Build'
   workingDirectory: build
 

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -10,6 +10,7 @@ variables:
   cli11.single: ON
   cli11.std: 14
   cli11.build_type: Debug
+  cli11.parallel: -j4
 
 jobs:
 
@@ -34,31 +35,22 @@ jobs:
   steps:
     - template: .ci/azure-steps.yml
 
-- job: Docker
+- job: GCC
   variables:
     cli11.single: OFF
   pool:
     vmImage: 'ubuntu-16.04'
   strategy:
     matrix:
-      gcc9:
+      9:
         containerImage: gcc:9
         cli11.std: 17
-      gcc4.7:
+      4.7:
         containerImage: gcc:4.7
         cli11.std: 11
-      clang3.5:
-        containerImage: silkeh/clang:3.5
-        cli11.std: 11
-      clang8:
-        containerImage: silkeh/clang:8
-        cli11.std: 17
   container: $[ variables['containerImage'] ]
   steps:
-    # Note that silkeh/clang does not include ca-certificates, so check the shasum for verification
-    - script: |
-        wget --no-check-certificate "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz"
-        echo "29faa62fb3a0b6323caa3d9557e1a5f1205614c0d4c5c2a9917f16a74f7eff68  cmake-3.14.3-Linux-x86_64.tar.gz" | shasum -sca 256
+    - script: wget "https://cmake.org/files/v3.14/cmake-3.14.3-Linux-x86_64.tar.gz"
       displayName: Download CMake
     - task: ExtractFiles@1
       inputs:
@@ -69,3 +61,21 @@ jobs:
       displayName: Add CMake to PATH
     - template: .ci/azure-steps.yml
 
+- job: Clang
+  variables:
+    cli11.single: OFF
+    cli11.parallel:
+  pool:
+    vmImage: 'ubuntu-16.04'
+  strategy:
+    matrix:
+      3.5:
+        containerImage: silkeh/clang:3.5
+        cli11.std: 11
+      8:
+        containerImage: silkeh/clang:8
+        cli11.std: 17
+  container: $[ variables['containerImage'] ]
+  steps:
+    - template: .ci/azure-steps.yml
+