From 9ea36760f68bc803af99e7405972436d9eb73876 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Fri, 20 Nov 2020 01:18:48 +0200 Subject: [PATCH] Revert "Split into lines; fix cd" This reverts commit 8da42266d566cd2b633787a6f35f91062b4f10c3. --- .github/workflows/ci.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 21960ed..78903a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,19 +33,19 @@ jobs: - uses: actions/checkout@v2 - name: Setup - run: - - REF=${GITHUB_BASE_REF:-$GITHUB_REF} - - BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true - - cd .. - - git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - - cd boost-root - - cp -r $GITHUB_WORKSPACE/* libs/assert - - git submodule update --init tools/boostdep - - python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" assert - - ./bootstrap.sh - - ./b2 headers + run: | + REF=${GITHUB_BASE_REF:-$GITHUB_REF} + BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true + cd .. + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root + cd boost-root + cp -r $GITHUB_WORKSPACE/* libs/assert + git submodule update --init tools/boostdep + python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" assert + ./bootstrap.sh + ./b2 headers - name: Test - run: - - cd ../boost-root - - ./b2 -j3 libs/assert/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} + run: | + cd boost-root + ./b2 -j3 libs/assert/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}}