diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c42355425..e16a8fae62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,7 @@ if(NOT DEFINED VCPKG_VERSION OR VCPKG_VERSION STREQUAL "") set(VCPKG_VERSION "unknownhash") endif() -set(VCPKG_BASE_VERSION "2021-11-02") +set(VCPKG_BASE_VERSION "2021-11-15") set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/azure-pipelines/setup-gcc6-vm.sh b/azure-pipelines/setup-gcc6-vm.sh deleted file mode 100644 index aacc0b70c4..0000000000 --- a/azure-pipelines/setup-gcc6-vm.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# This script is run by cloud-init on top of an Ubuntu 18.04 blank image to install prerequisites. -sudo add-apt-repository universe -sudo apt-get update -sudo apt-get install -y g++-6 gcc-6 build-essential make -curl -o cmake-3.21.1-linux-x86_64.sh -L https://github.com/Kitware/CMake/releases/download/v3.21.1/cmake-3.21.1-linux-x86_64.sh -chmod +x cmake-3.21.1-linux-x86_64.sh -sudo ./cmake-3.21.1-linux-x86_64.sh --skip-license --prefix=/