Testing CMake and Ninja installs

- Add back install of ninja
- Remove CMake install

Author: josesimoes

azure-pipelines-nightly.yml

@@ -311,6 +311,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/download-hexdfu.yml
       - template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -706,7 +707,6 @@ jobs:
     steps:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
-      - template: azure-pipelines-templates/download-install-cmake.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
       - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/build-ti-simplelink-targets.yml

azure-pipelines-templates/download-install-ninja.yml

@@ -7,31 +7,10 @@ parameters:
     default: $(Build.SourcesDirectory)
 
 steps:
-  - task: Cache@2
-    inputs:
-      key: "1-13-1 | ninjaKey"
-      restoreKeys: ninjaKey
-      path: $(Agent.TempDirectory)/ninja
-      cacheHitVar: NINJA_CACHE_RESTORED
-    displayName: Cache Ninja
 
-  - task: PowerShell@2
-    condition: ne(variables.NINJA_CACHE_RESTORED, 'true')
-    displayName: Download Ninja
-    inputs:
-      targetType: "filePath"
-      filePath: '${{ parameters.repoDirectory }}\install-scripts\install-ninja.ps1'
-      failOnStderr: true
-
-  - task: ExtractFiles@1
-    inputs:
-      archiveFilePatterns: '$(Agent.TempDirectory)\ninja.zip'
-      destinationFolder: '$(Agent.TempDirectory)\ninja'
-    condition: ne(variables.NINJA_CACHE_RESTORED, 'true')
-    displayName: Extract Ninja
-
-  - script: echo "##vso[task.prependpath]$(Agent.TempDirectory)\ninja"
-    displayName: Tweak PATH with Ninja
+  - script: |
+      dir
+    displayName: dummy step
 
   - script: |
       ninja --version

azure-pipelines.yml

@@ -421,6 +421,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/download-hexdfu.yml
       - template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -631,6 +632,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/build-freertos-nxp-targets.yml
       - template: azure-pipelines-templates/pack-publish-artifacts.yml
@@ -707,7 +709,6 @@ jobs:
     steps:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
-      - template: azure-pipelines-templates/download-install-cmake.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
       - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/build-ti-simplelink-targets.yml
@@ -780,6 +781,7 @@ jobs:
       - template: azure-pipelines-templates/build-preparations.yml
       - template: azure-pipelines-templates/nb-gitversioning.yml
       - template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
+      - template: azure-pipelines-templates/download-install-ninja.yml
       - template: azure-pipelines-templates/download-hexdfu.yml
       - template: azure-pipelines-templates/download-srecord.yml
       - template: azure-pipelines-templates/build-azurertos-targets.yml