Try this on for size...

pull/457/head
Bret Curtis 7 years ago
parent 78a3f95ee4
commit 209359bbc3

@ -51,8 +51,8 @@ Windows:
tags: tags:
- win10 - win10
- msvc2017 - msvc2017
except: # except:
- branches # because our CI VMs are not public, MRs can't use them and timeout # - branches # because our CI VMs are not public, MRs can't use them and timeout
stage: build stage: build
allow_failure: true allow_failure: true
script: script:

@ -412,11 +412,13 @@ fi
if [ -z $APPVEYOR ]; then if [ -z $APPVEYOR ]; then
cd $DEPS_INSTALL cd $DEPS_INSTALL
BOOST_SDK="$(real_pwd)/Boost"
# Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names # Boost's installer is still based on ms-dos API that doesn't support larger than 260 char path names
# We work around this by installing to root of the current working drive and then move it to our deps # We work around this by installing to root of the current working drive and then move it to our deps
# get the current working drive's root, we'll install to that temporarily
CWD_DRIVE_ROOT=$(echo "$(powershell -command '(get-location).Drive.Root')" | sed "s,\\\\,/,g" | sed "s,\(.\):,/\\1,")
BOOST_SDK="$(real_pwd)/Boost"
CWD_DRIVE_ROOT="$(powershell -command '(get-location).Drive.Root')" # get the current working drive's root
if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then if [ -d Boost ] && grep "BOOST_VERSION 106700" Boost/boost/version.hpp > /dev/null; then
printf "Exists. " printf "Exists. "

Loading…
Cancel
Save