From e120a83d1ec4f2e9755a3d266aa986755d947444 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Tue, 15 Jan 2019 18:28:28 +0300 Subject: [PATCH] Revert "Use depinst to install dependencies in CI. Increase the number of git fetch jobs to 8." This reverts commit 424fea5881af84bc6fffed97065c8df2e4f50bc5. By request from Peter Dimov in https://github.com/boostorg/utility/commit/424fea5881af84bc6fffed97065c8df2e4f50bc5#commitcomment-31945411. The manual enumeration of Boost.Utility dependencies server as a detection mechanism for unwanted dependencies creep in. --- .travis.yml | 14 ++++++++++---- appveyor.yml | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 86af1dd..f43f599 100644 --- a/.travis.yml +++ b/.travis.yml @@ -215,20 +215,26 @@ matrix: env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z install: - - GIT_FETCH_JOBS=8 - BOOST_BRANCH=develop - if [ "$TRAVIS_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi - cd .. - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - - git submodule init tools/boostdep - git submodule init tools/build - git submodule init tools/boost_install - git submodule init libs/headers + - git submodule init libs/assert - git submodule init libs/config - - git submodule update --jobs $GIT_FETCH_JOBS + - git submodule init libs/core + - git submodule init libs/preprocessor + - git submodule init libs/static_assert + - git submodule init libs/throw_exception + - git submodule init libs/type_traits + - git submodule init libs/container_hash + - git submodule init libs/integer + - git submodule init libs/detail + - git submodule update --jobs 4 - cp -r $TRAVIS_BUILD_DIR/* libs/utility - - python tools/boostdep/depinst/depinst.py $DEPINST_ARG_INCLUDE_EXAMPLES --git_args "--jobs $GIT_FETCH_JOBS" utility - ./bootstrap.sh - ./b2 headers diff --git a/appveyor.yml b/appveyor.yml index 2262009..f3f801c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,20 +23,26 @@ environment: CXXSTD: 14,17 install: - - set GIT_FETCH_JOBS=8 - set BOOST_BRANCH=develop - if "%APPVEYOR_REPO_BRANCH%" == "master" set BOOST_BRANCH=master - cd .. - git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - cd boost-root - - git submodule init tools/boostdep - git submodule init tools/build - git submodule init tools/boost_install - git submodule init libs/headers + - git submodule init libs/assert - git submodule init libs/config - - git submodule update --jobs %GIT_FETCH_JOBS% + - git submodule init libs/core + - git submodule init libs/preprocessor + - git submodule init libs/static_assert + - git submodule init libs/throw_exception + - git submodule init libs/type_traits + - git submodule init libs/container_hash + - git submodule init libs/integer + - git submodule init libs/detail + - git submodule update --jobs 4 - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\utility - - python tools/boostdep/depinst/depinst.py --git_args "--jobs %GIT_FETCH_JOBS%" utility - cmd /c bootstrap - b2 -d0 headers