Skip to content

Commit 7bc3b9e

Browse files
committed
Revert need for cmake install in CI
Remove need for ninja install in CI Both are now handled correctly by the image.
1 parent ac009d5 commit 7bc3b9e

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

azure-pipelines-nightly.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,9 @@ jobs:
301301
steps:
302302
- template: azure-pipelines-templates/build-preparations.yml
303303
- template: azure-pipelines-templates/nb-gitversioning.yml
304-
- template: azure-pipelines-templates/download-install-cmake.yml
304+
# - template: azure-pipelines-templates/download-install-cmake.yml
305305
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
306-
- template: azure-pipelines-templates/download-install-ninja.yml
306+
# - template: azure-pipelines-templates/download-install-ninja.yml
307307
- template: azure-pipelines-templates/download-srecord.yml
308308
- template: azure-pipelines-templates/download-hexdfu.yml
309309
- template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -672,9 +672,9 @@ jobs:
672672
steps:
673673
- template: azure-pipelines-templates/build-preparations.yml
674674
- template: azure-pipelines-templates/nb-gitversioning.yml
675-
- template: azure-pipelines-templates/download-install-cmake.yml
675+
# - template: azure-pipelines-templates/download-install-cmake.yml
676676
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
677-
- template: azure-pipelines-templates/download-install-ninja.yml
677+
# - template: azure-pipelines-templates/download-install-ninja.yml
678678
- template: azure-pipelines-templates/build-ti-simplelink-targets.yml
679679
- template: azure-pipelines-templates/pack-publish-artifacts.yml
680680
- template: azure-pipelines-templates/publish-cloudsmith.yml
@@ -724,9 +724,9 @@ jobs:
724724
steps:
725725
- template: azure-pipelines-templates/build-preparations.yml
726726
- template: azure-pipelines-templates/nb-gitversioning.yml
727-
- template: azure-pipelines-templates/download-install-cmake.yml
727+
# - template: azure-pipelines-templates/download-install-cmake.yml
728728
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
729-
- template: azure-pipelines-templates/download-install-ninja.yml
729+
# - template: azure-pipelines-templates/download-install-ninja.yml
730730
- template: azure-pipelines-templates/download-hexdfu.yml
731731
- template: azure-pipelines-templates/download-srecord.yml
732732
- template: azure-pipelines-templates/build-azurertos-targets.yml

azure-pipelines.yml

+8-8
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,9 @@ jobs:
420420
steps:
421421
- template: azure-pipelines-templates/build-preparations.yml
422422
- template: azure-pipelines-templates/nb-gitversioning.yml
423-
- template: azure-pipelines-templates/download-install-cmake.yml
423+
# - template: azure-pipelines-templates/download-install-cmake.yml
424424
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
425-
- template: azure-pipelines-templates/download-install-ninja.yml
425+
# - template: azure-pipelines-templates/download-install-ninja.yml
426426
- template: azure-pipelines-templates/download-srecord.yml
427427
- template: azure-pipelines-templates/download-hexdfu.yml
428428
- template: azure-pipelines-templates/build-chibios-stm32-targets.yml
@@ -623,9 +623,9 @@ jobs:
623623
steps:
624624
- template: azure-pipelines-templates/build-preparations.yml
625625
- template: azure-pipelines-templates/nb-gitversioning.yml
626-
- template: azure-pipelines-templates/download-install-cmake.yml
626+
# - template: azure-pipelines-templates/download-install-cmake.yml
627627
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
628-
- template: azure-pipelines-templates/download-install-ninja.yml
628+
# - template: azure-pipelines-templates/download-install-ninja.yml
629629
- template: azure-pipelines-templates/download-srecord.yml
630630
- template: azure-pipelines-templates/build-freertos-nxp-targets.yml
631631
- template: azure-pipelines-templates/pack-publish-artifacts.yml
@@ -702,9 +702,9 @@ jobs:
702702
steps:
703703
- template: azure-pipelines-templates/build-preparations.yml
704704
- template: azure-pipelines-templates/nb-gitversioning.yml
705-
- template: azure-pipelines-templates/download-install-cmake.yml
705+
# - template: azure-pipelines-templates/download-install-cmake.yml
706706
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
707-
- template: azure-pipelines-templates/download-install-ninja.yml
707+
# - template: azure-pipelines-templates/download-install-ninja.yml
708708
- template: azure-pipelines-templates/build-ti-simplelink-targets.yml
709709
- template: azure-pipelines-templates/pack-publish-artifacts.yml
710710
- template: azure-pipelines-templates/publish-cloudsmith.yml
@@ -774,9 +774,9 @@ jobs:
774774
steps:
775775
- template: azure-pipelines-templates/build-preparations.yml
776776
- template: azure-pipelines-templates/nb-gitversioning.yml
777-
- template: azure-pipelines-templates/download-install-cmake.yml
777+
# - template: azure-pipelines-templates/download-install-cmake.yml
778778
- template: azure-pipelines-templates/download-install-arm-gcc-toolchain.yml
779-
- template: azure-pipelines-templates/download-install-ninja.yml
779+
# - template: azure-pipelines-templates/download-install-ninja.yml
780780
- template: azure-pipelines-templates/download-hexdfu.yml
781781
- template: azure-pipelines-templates/download-srecord.yml
782782
- template: azure-pipelines-templates/build-azurertos-targets.yml

0 commit comments

Comments
 (0)