diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index eff0bf1aa..d2ad49c8d 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -177,17 +177,27 @@ commands: echo 'export CXX=clang++-3.8' >> $BASH_ENV ln -s /usr/bin/llvm-symbolizer{-3.8,} - install-cmake-3_4: + install-cmake: + parameters: + version: + type: string + sudo: + type: string + default: "" steps: - run: - name: Install CMake 3.4 + name: Install CMake << parameters.version >> command: | - apt install -y wget + version_short=<< parameters.version >> + version_short="${version_short%.*}" + << parameters.sudo >> apt install -y wget mkdir -p $HOME/cmake && cd $HOME/cmake - wget -nc --no-check-certificate https://cmake.org/files/v3.4/cmake-3.4.3-Linux-x86_64.tar.gz - tar --strip-components=1 -xzf cmake-3.4.3-Linux-x86_64.tar.gz + wget -nc --no-check-certificate https://cmake.org/files/v$version_short/cmake-<< parameters.version >>-Linux-x86_64.tar.gz + tar --strip-components=1 -xzf cmake-<< parameters.version >>-Linux-x86_64.tar.gz echo 'export PATH=$HOME/cmake/bin:$PATH' >> $BASH_ENV - source $BASH_ENV && cmake --version | grep 3.4 + source $BASH_ENV + cmake --version | grep << parameters.version >> + ctest --version | grep << parameters.version >> install-swiftshader-gles: parameters: @@ -284,7 +294,8 @@ jobs: # TODO: revisit when we get rid of more STL - cap-ninja-jobs - install-gcc-4_8 - - install-cmake-3_4 + - install-cmake: + version: "3.4.3" - setup-null-openal-driver - build: script: unix-desktop.sh @@ -345,7 +356,8 @@ jobs: # TODO: revisit when we get rid of more STL - cap-ninja-jobs - install-gcc-4_8 - - install-cmake-3_4 + - install-cmake: + version: "3.4.3" - install-swiftshader-gles: build: ubuntu-16.04 - build: @@ -369,7 +381,8 @@ jobs: # TODO: revisit when we get rid of more STL - cap-ninja-jobs - install-gcc-4_8 - - install-cmake-3_4 + - install-cmake: + version: "3.4.3" - install-swiftshader-gles: build: ubuntu-16.04 - build: @@ -394,7 +407,8 @@ jobs: - cap-ninja-jobs: count: 20 - install-gcc-4_8 - - install-cmake-3_4 + - install-cmake: + version: "3.4.3" - setup-null-openal-driver - build: script: unix-desktop.sh @@ -416,7 +430,8 @@ jobs: # TODO: revisit when we get rid of more STL - cap-ninja-jobs - install-gcc-4_8 - - install-cmake-3_4 + - install-cmake: + version: "3.4.3" - setup-null-openal-driver - build: script: unix-desktop.sh @@ -435,7 +450,8 @@ jobs: - install-base-linux: extra: libgl1-mesa-dev libopenal-dev libvulkan-dev - install-clang-3_8 - - install-cmake-3_4 + - install-cmake: + version: "3.4.3" - setup-null-openal-driver - build: script: unix-desktop.sh @@ -454,7 +470,8 @@ jobs: - install-base-linux: extra: libgl1-mesa-dev libopenal-dev libvulkan-dev - install-clang-3_8 - - install-cmake-3_4 + - install-cmake: + version: "3.4.3" - setup-null-openal-driver - build: script: unix-desktop.sh