Skip to content

Commit 3b672c0

Browse files
committed
Testing CMake and Ninja installs
- Add back install of ninja - Remove CMake install
1 parent 2913d7b commit 3b672c0

File tree

3 files changed

+7
-26
lines changed

3 files changed

+7
-26
lines changed

azure-pipelines-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ jobs:
311311
- template: azure-pipelines-templates/build-preparations.yml
312312
- template: azure-pipelines-templates/nb-gitversioning.yml
313313
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
314+
- template: azure-pipelines-templates/download-install-ninja.yml
314315
- template: azure-pipelines-templates/download-srecord.yml
315316
- template: azure-pipelines-templates/download-hexdfu.yml
316317
- template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -706,7 +707,6 @@ jobs:
706707
steps:
707708
- template: azure-pipelines-templates/build-preparations.yml
708709
- template: azure-pipelines-templates/nb-gitversioning.yml
709-
- template: azure-pipelines-templates/download-install-cmake.yml
710710
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
711711
- template: azure-pipelines-templates/download-install-ninja.yml
712712
- template: azure-pipelines-templates/build-ti-simplelink-targets.yml

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

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,10 @@ parameters:
77
default: $(Build.SourcesDirectory)
88

99
steps:
10-
- task: Cache@2
11-
inputs:
12-
key: "1-13-1 | ninjaKey"
13-
restoreKeys: ninjaKey
14-
path: $(Agent.TempDirectory)/ninja
15-
cacheHitVar: NINJA_CACHE_RESTORED
16-
displayName: Cache Ninja
1710

18-
- task: PowerShell@2
19-
condition: ne(variables.NINJA_CACHE_RESTORED, 'true')
20-
displayName: Download Ninja
21-
inputs:
22-
targetType: "filePath"
23-
filePath: '${{ parameters.repoDirectory }}\install-scripts\install-ninja.ps1'
24-
failOnStderr: true
25-
26-
- task: ExtractFiles@1
27-
inputs:
28-
archiveFilePatterns: '$(Agent.TempDirectory)\ninja.zip'
29-
destinationFolder: '$(Agent.TempDirectory)\ninja'
30-
condition: ne(variables.NINJA_CACHE_RESTORED, 'true')
31-
displayName: Extract Ninja
32-
33-
- script: echo "##vso[task.prependpath]$(Agent.TempDirectory)\ninja"
34-
displayName: Tweak PATH with Ninja
11+
- script: |
12+
dir
13+
displayName: dummy step
3514
3615
- script: |
3716
ninja --version

azure-pipelines.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,7 @@ jobs:
421421
- template: azure-pipelines-templates/build-preparations.yml
422422
- template: azure-pipelines-templates/nb-gitversioning.yml
423423
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
424+
- template: azure-pipelines-templates/download-install-ninja.yml
424425
- template: azure-pipelines-templates/download-srecord.yml
425426
- template: azure-pipelines-templates/download-hexdfu.yml
426427
- template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -631,6 +632,7 @@ jobs:
631632
- template: azure-pipelines-templates/build-preparations.yml
632633
- template: azure-pipelines-templates/nb-gitversioning.yml
633634
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
635+
- template: azure-pipelines-templates/download-install-ninja.yml
634636
- template: azure-pipelines-templates/download-srecord.yml
635637
- template: azure-pipelines-templates/build-freertos-nxp-targets.yml
636638
- template: azure-pipelines-templates/pack-publish-artifacts.yml
@@ -707,7 +709,6 @@ jobs:
707709
steps:
708710
- template: azure-pipelines-templates/build-preparations.yml
709711
- template: azure-pipelines-templates/nb-gitversioning.yml
710-
- template: azure-pipelines-templates/download-install-cmake.yml
711712
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
712713
- template: azure-pipelines-templates/download-install-ninja.yml
713714
- template: azure-pipelines-templates/build-ti-simplelink-targets.yml
@@ -780,6 +781,7 @@ jobs:
780781
- template: azure-pipelines-templates/build-preparations.yml
781782
- template: azure-pipelines-templates/nb-gitversioning.yml
782783
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
784+
- template: azure-pipelines-templates/download-install-ninja.yml
783785
- template: azure-pipelines-templates/download-hexdfu.yml
784786
- template: azure-pipelines-templates/download-srecord.yml
785787
- template: azure-pipelines-templates/build-azurertos-targets.yml

0 commit comments

Comments
 (0)