diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml index 232a58522..94b4ecfc5 100644 --- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml +++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml @@ -200,8 +200,6 @@ jobs: workingDirectory: $(Agent.TempDirectory) displayName: Download and Install Doxygen - - template: /eng/pipelines/templates/steps/install-cmake.yml - - template: /eng/pipelines/templates/steps/setup-msvc.yml - template: /eng/pipelines/templates/steps/vcpkg.yml diff --git a/eng/pipelines/templates/jobs/ci.tests.yml b/eng/pipelines/templates/jobs/ci.tests.yml index 8f13dae47..77d5f5849 100644 --- a/eng/pipelines/templates/jobs/ci.tests.yml +++ b/eng/pipelines/templates/jobs/ci.tests.yml @@ -113,8 +113,6 @@ jobs: - template: /eng/pipelines/templates/steps/setup-msvc.yml - - template: /eng/pipelines/templates/steps/install-cmake.yml - - pwsh: sudo apt update && sudo apt install -y $(AptDependencies) retryCountOnTaskFailure: 10 condition: and(succeeded(), ne(variables['AptDependencies'], '')) diff --git a/eng/pipelines/templates/jobs/cmake-generate.tests.yml b/eng/pipelines/templates/jobs/cmake-generate.tests.yml index 74a418139..1f52ec097 100644 --- a/eng/pipelines/templates/jobs/cmake-generate.tests.yml +++ b/eng/pipelines/templates/jobs/cmake-generate.tests.yml @@ -79,8 +79,6 @@ jobs: - template: /eng/pipelines/templates/steps/setup-msvc.yml - - template: /eng/pipelines/templates/steps/install-cmake.yml - - pwsh: sudo apt update && sudo apt install -y $(AptDependencies) retryCountOnTaskFailure: 10 condition: and(succeeded(), ne(variables['AptDependencies'], '')) diff --git a/eng/pipelines/templates/jobs/live.tests.yml b/eng/pipelines/templates/jobs/live.tests.yml index 4d14187bf..a9abf70a1 100644 --- a/eng/pipelines/templates/jobs/live.tests.yml +++ b/eng/pipelines/templates/jobs/live.tests.yml @@ -106,8 +106,6 @@ jobs: - template: /eng/pipelines/templates/steps/setup-msvc.yml - - template: /eng/pipelines/templates/steps/install-cmake.yml - # Add g++5 repo to ubuntu - bash: sudo sh -c "echo 'deb http://ftp.debian.org/debian/ stretch main' >> /etc/apt/sources.list" displayName: Add g++ 5 diff --git a/eng/pipelines/templates/jobs/perf.yml b/eng/pipelines/templates/jobs/perf.yml index f1d2447a7..5491e9dc8 100644 --- a/eng/pipelines/templates/jobs/perf.yml +++ b/eng/pipelines/templates/jobs/perf.yml @@ -50,8 +50,7 @@ extends: targetVersion: 1.0.0-dev.20240423.2 rootFolder: '$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}' templateFolder: '$(Build.SourcesDirectory)/sdk/${{parameters.ServiceDirectory}}' - - template: /eng/pipelines/templates/steps/install-cmake.yml - + ServiceDirectory: ${{ parameters.ServiceDirectory }} PackageVersions: ${{ parameters.PackageVersions }} Tests: ${{ parameters.Tests }} diff --git a/eng/pipelines/templates/steps/install-cmake.yml b/eng/pipelines/templates/steps/install-cmake.yml deleted file mode 100644 index ac83a53cd..000000000 --- a/eng/pipelines/templates/steps/install-cmake.yml +++ /dev/null @@ -1,15 +0,0 @@ -# This temporary fix resolves an issue with CMake and vcpkg. When Linux and -# Windows agents have a later version of CMake installed this can be removed. - -parameters: - Version: '3.29.2' - -steps: - - bash: | - curl -fsSL "https://github.com/Kitware/CMake/releases/download/v${{ parameters.Version }}/cmake-${{ parameters.Version }}-linux-x86_64.sh" -o cmakeinstall.sh - - sudo chmod +x cmakeinstall.sh \ - && sudo ./cmakeinstall.sh --prefix=/usr/local --exclude-subdir \ - && sudo rm cmakeinstall.sh - displayName: Install Cmake ${{ parameters.Version }} (Linux) - condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))