[azure-pipelines] tidy pipelines

Raffaello · May 10, 2020 · ae98ca0 · ae98ca0
1 parent 3be9aef
commit ae98ca0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 25 deletions.
diff --git a/azure-pipelines/linux.yml b/azure-pipelines/linux.yml
@@ -33,25 +33,17 @@ stages:
 - stage: Dep
   jobs:
     - job: vcpkg
-      strategy:
-        matrix:
-          Linux:
-            imageName: ${{ variables.linux_image }}
-            TRIPLET: x64-linux
       pool:
-        vmImage: $(imageName)
+        vmImage: ${{ variables.linux_image }}
       steps:
       - template: templates/dep-vcpkg-steps.yml
         parameters:
           vcpkg_key_cache: $(CACHE_VCPKG_KEY)
-          triplet: $(TRIPLET)
-          arch: $(ARCH)
+          triplet: x64-linux
 
 - stage: CI
   jobs:
     - job: Linux
-      variables:
-        TRIPLET: x64-linux
       strategy:
         matrix:
           GCC Debug:
@@ -64,7 +56,7 @@ stages:
       - template: 'templates/ci-steps.yml'
         parameters:
           vcpkg_key_cache: $(CACHE_VCPKG_KEY)
-          triplet: $(TRIPLET)
+          triplet: x64-linux
           build_type: $(CONFIGURATION)
           test: false
           install: false
diff --git a/azure-pipelines/macos.yml b/azure-pipelines/macos.yml
@@ -32,25 +32,17 @@ stages:
 - stage: Dep
   jobs:
     - job: vcpkg
-      strategy:
-        matrix:
-          MacOS:
-            imageName: ${{ variables.mac_image }}
-            TRIPLET: x64-osx
       pool:
-        vmImage: $(imageName)
+        vmImage:  ${{ variables.mac_image }}
       steps:
       - template: templates/dep-vcpkg-steps.yml
         parameters:
           vcpkg_key_cache: $(CACHE_VCPKG_KEY)
-          triplet: $(TRIPLET)
-          arch: $(ARCH)
+          triplet: x64-osx
 
 - stage: CI
   jobs:
     - job: macOS
-      variables:
-        TRIPLET: x64-osx
       strategy:
         matrix:
           Debug:
@@ -63,6 +55,6 @@ stages:
       - template: 'templates/ci-steps.yml'
         parameters:
           vcpkg_key_cache: $(CACHE_VCPKG_KEY)
-          triplet: $(TRIPLET)
+          triplet: x64-osx
           build_type: $(CONFIGURATION)
           install: false
diff --git a/azure-pipelines/windows.yml b/azure-pipelines/windows.yml
@@ -36,15 +36,13 @@ stages:
       strategy:
         matrix:
           Win 32 bits:
-            imageName: ${{ variables.windows_image }}
             TRIPLET: x86-windows
             ARCH: 32
           Win 64 bits:
-            imageName: ${{ variables.windows_image }}
             TRIPLET: x64-windows
             ARCH: 64
       pool:
-        vmImage: $(imageName)
+        vmImage: ${{ variables.windows_image }}
       steps:
       - template: templates/dep-vcpkg-steps.yml
         parameters:
@@ -57,6 +55,8 @@ stages:
     - job: Windows
       variables:
         #SDL2_STATIC: OFF
+        # TODO remove the line below
+        # BODY [..] when done the build-matrix configuration
         BUILD_SHARED_LIBS: ON
       strategy:
         matrix: