From 91031df89b6ac408727f9f7872766e9dcd41a1cc Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Wed, 14 Oct 2020 13:21:40 +0200 Subject: [PATCH] Build curl with only core http and https. --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61166c8..763b63a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,14 +15,14 @@ static:linux:deps: - VCPKG_PATH=$(pwd)/vcpkg - TRIPLET=x86-linux-goldberg - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf[zlib]:${TRIPLET} || exit 1 - - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[openssl]:${TRIPLET} || exit 1 + - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[core,openssl]:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install stb:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install glew:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-json:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-fifo-map:${TRIPLET} || exit 1 - TRIPLET=x64-linux-goldberg - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf[zlib]:${TRIPLET} || exit 1 - - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[openssl]:${TRIPLET} || exit 1 + - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[core,openssl]:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install stb:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install glew:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-json:${TRIPLET} || exit 1 @@ -50,14 +50,14 @@ static:windows:deps: - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf:${TRIPLET} || exit 1 - TRIPLET=x86-windows-goldberg - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf[zlib]:${TRIPLET} || exit 1 - - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[winssl]:${TRIPLET} || exit 1 + - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[core,winssl]:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install stb:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install glew:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-json:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-fifo-map:${TRIPLET} || exit 1 - TRIPLET=x64-windows-goldberg - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf[zlib]:${TRIPLET} || exit 1 - - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[winssl]:${TRIPLET} || exit 1 + - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[core,winssl]:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install stb:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install glew:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-json:${TRIPLET} || exit 1 @@ -85,13 +85,13 @@ static:macosx:deps: - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf:${TRIPLET} || exit 1 - TRIPLET=x86-macosx-goldberg - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf[zlib]:${TRIPLET} || exit 1 - - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[openssl]:${TRIPLET} || exit 1 + - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[core,openssl]:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install stb:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-json:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-fifo-map:${TRIPLET} || exit 1 - TRIPLET=x64-macosx-goldberg - vcpkg "--x-install-root=${VCPKG_PATH}" install protobuf[zlib]:${TRIPLET} || exit 1 - - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[openssl]:${TRIPLET} || exit 1 + - vcpkg "--x-install-root=${VCPKG_PATH}" install curl[core,openssl]:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install stb:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-json:${TRIPLET} || exit 1 - vcpkg "--x-install-root=${VCPKG_PATH}" install nlohmann-fifo-map:${TRIPLET} || exit 1