From b677d1eeae6b075b001475a21e8000c0d465109b Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sun, 10 Oct 2021 18:41:33 +0300 Subject: [PATCH] Only update the necessary submodules in ci.yml --- .github/workflows/ci.yml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1ed7a81..885b6a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -339,7 +339,6 @@ jobs: BUILD_JOBS=$((nproc || sysctl -n hw.ncpu) 2> /dev/null) echo "BUILD_JOBS=$BUILD_JOBS" >> $GITHUB_ENV echo "CMAKE_BUILD_PARALLEL_LEVEL=$BUILD_JOBS" >> $GITHUB_ENV - DEPINST_ARGS=() GIT_VERSION="$(git --version | sed -e 's/git version //')" GIT_HAS_JOBS=1 if [ -f "/etc/debian_version" ] @@ -366,16 +365,23 @@ jobs: fi if [ "$GIT_HAS_JOBS" -ne 0 ] then - DEPINST_ARGS+=("--git_args" "--jobs $GIT_FETCH_JOBS") + GIT_ARGS="--jobs $GIT_FETCH_JOBS" fi cd .. git clone -b "$BOOST_BRANCH" --depth 1 "https://github.com/boostorg/boost.git" "boost-root" cd boost-root mkdir -p libs/$LIBRARY cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY - git submodule update --init tools/boostdep - DEPINST_ARGS+=("$LIBRARY") - python tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}" + git submodule init tools/boost_install + git submodule init libs/headers + git submodule init tools/build + git submodule init tools/cmake + git submodule init libs/assert + git submodule init libs/config + git submodule init libs/static_assert + git submodule init libs/throw_exception + git submodule init libs/type_traits + git submodule update $GIT_ARGS if [ -z "${{matrix.cmake_tests}}" ] then ./bootstrap.sh @@ -493,8 +499,16 @@ jobs: git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\ - git submodule update --init tools/boostdep - python tools/boostdep/depinst/depinst.py --git_args "--jobs %GIT_FETCH_JOBS%" %LIBRARY% + git submodule init tools/boost_install + git submodule init libs/headers + git submodule init tools/build + git submodule init tools/cmake + git submodule init libs/assert + git submodule init libs/config + git submodule init libs/static_assert + git submodule init libs/throw_exception + git submodule init libs/type_traits + git submodule update --jobs %GIT_FETCH_JOBS% cmd /c bootstrap b2 -d0 headers