From eac502b0591d62de9d54db845d312a169e870eb5 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Mon, 9 Sep 2024 19:30:19 +0300 Subject: [PATCH] Revert changes to ci.yml --- .github/workflows/ci.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9631460..d947617 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,6 @@ on: - master - develop - feature/** - - modular jobs: posix: @@ -368,12 +367,10 @@ jobs: REF=${GITHUB_BASE_REF:-$GITHUB_REF} REF=${REF#refs/heads/} echo REF: $REF - BOOST_BRANCH=develop && ( test "${GITHUB_REF_NAME}" == "master" || test "${GITHUB_REF_NAME}" == "modular" ) && BOOST_BRANCH=${GITHUB_REF_NAME} || true - BOOST_GIT=https://github.com/${GITHUB_REPOSITORY/boost_install/boost}.git - echo BOOST_GIT: ${BOOST_GIT} - echo BOOST_BRANCH: ${BOOST_BRANCH} + BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true + echo BOOST_BRANCH: $BOOST_BRANCH cd .. - git clone -b "${BOOST_BRANCH}" --depth 1 "${BOOST_GIT}" boost-root + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root git submodule update --init --jobs 3 tools/boostdep libs/assert libs/config libs/core libs/${{matrix.lib}} python tools/boostdep/depinst/depinst.py -X test -g "--jobs 3" ${{matrix.lib}} @@ -562,12 +559,9 @@ jobs: if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF% set BOOST_BRANCH=develop for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master - for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "modular" set BOOST_BRANCH=modular - set BOOST_GIT=https://github.com/%GITHUB_REPOSITORY:boost_install=boost%.git - echo BOOST_GIT: %BOOST_GIT% echo BOOST_BRANCH: %BOOST_BRANCH% cd .. - git clone -b %BOOST_BRANCH% --depth 1 %BOOST_GIT% boost-root + git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root cd boost-root git submodule update --init --jobs 3 tools/boostdep libs/assert libs/config libs/core libs/${{matrix.lib}} python tools/boostdep/depinst/depinst.py -X test -g "--jobs 3" ${{matrix.lib}}