diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 22551ae..d7f16f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -219,7 +219,7 @@ jobs: then apt-get -o Acquire::Retries=$NET_RETRY_COUNT update apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y sudo software-properties-common tzdata wget curl apt-transport-https make apt-file unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev - + # install pip: python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))') if [[ ${python_version} =~ ^3\.[0-5]$ ]]; then @@ -229,12 +229,12 @@ jobs: fi wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py python3 get-pip.py - + # install git: # apt-get install -y git apt-add-repository ppa:git-core/ppa apt-get -o Acquire::Retries=$NET_RETRY_COUNT update && apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y git - + # install cmake: # apt-get -o Acquire::Retries=$NET_RETRY_COUNT install -y cmake sudo pip3 install cmake @@ -332,15 +332,9 @@ 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 - git submodule update --init --recursive - mkdir -p libs/$SELF - cp -r $GITHUB_WORKSPACE/* libs/$SELF - + cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY + git submodule update --init tools/boostdep DEPINST_ARGS+=("$LIBRARY") python tools/boostdep/depinst/depinst.py "${DEPINST_ARGS[@]}" if [ -z "${{matrix.cmake_tests}}" ]