diff options
| author | Bob Ellison <bob@lunarg.com> | 2019-05-23 11:43:54 -0600 |
|---|---|---|
| committer | Bob Ellison <45772930+lunarpapillo@users.noreply.github.com> | 2019-06-06 14:41:55 -0600 |
| commit | d8a65c15cdf000f1a1903f1a5c65497d744d414a (patch) | |
| tree | d7a81b1097f0bba65549a7ae1960a6dad741b0b6 | |
| parent | d2de4ac0a28766c6fb10968fdcc4d75566eef8d7 (diff) | |
| download | usermoji-d8a65c15cdf000f1a1903f1a5c65497d744d414a.tar.xz | |
cmake: Use CMake 3.10.2 for CI
These changes ensure that the Travis and AppVeyor
builds use a known version of CMake.
| -rw-r--r-- | .appveyor.yml | 6 | ||||
| -rw-r--r-- | .travis.yml | 12 |
2 files changed, 17 insertions, 1 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index 0b82eff0..76aa833d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -22,6 +22,12 @@ branches: only: - master +# Install desired CMake version 3.10.2 before any other building +install: + - choco upgrade cmake --version 3.10.2 + - set path=C:\Program Files\CMake\bin;%path% + - cmake --version + before_build: - "SET PATH=C:\\Python35;C:\\Python35\\Scripts;%PATH%" - echo Starting build for %APPVEYOR_REPO_NAME% in %APPVEYOR_BUILD_FOLDER% diff --git a/.travis.yml b/.travis.yml index 6e09f66b..1a176180 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,6 +45,17 @@ cache: ccache before_install: - set -e + - CMAKE_VERSION=3.10.2 + - | + if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then + CMAKE_URL="https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSION}-Linux-x86_64.tar.gz" + echo CMAKE_URL=${CMAKE_URL} + mkdir cmake-${CMAKE_VERSION} && travis_retry wget --no-check-certificate -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake-${CMAKE_VERSION} + export PATH=${PWD}/cmake-${CMAKE_VERSION}/bin:${PATH} + else + brew install cmake || brew upgrade cmake + fi + cmake --version - | if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]] || [[ "$VULKAN_BUILD_TARGET" == "GN" ]]; then # Install the appropriate Linux packages. @@ -73,7 +84,6 @@ before_install: script: - set -e - - cmake --version - | if [[ "$VULKAN_BUILD_TARGET" == "LINUX" ]]; then # Build Vulkan-Tools |