Revert "Split into lines; fix cd"

This reverts commit 8da42266d5.
This commit is contained in:
Peter Dimov
2020-11-20 01:18:48 +02:00
parent 8da42266d5
commit 9ea36760f6

View File

@@ -33,19 +33,19 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Setup - name: Setup
run: run: |
- REF=${GITHUB_BASE_REF:-$GITHUB_REF} REF=${GITHUB_BASE_REF:-$GITHUB_REF}
- BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
- cd .. cd ..
- git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root cd boost-root
- cp -r $GITHUB_WORKSPACE/* libs/assert cp -r $GITHUB_WORKSPACE/* libs/assert
- git submodule update --init tools/boostdep git submodule update --init tools/boostdep
- python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" assert python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" assert
- ./bootstrap.sh ./bootstrap.sh
- ./b2 headers ./b2 headers
- name: Test - name: Test
run: run: |
- cd ../boost-root cd boost-root
- ./b2 -j3 libs/assert/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} ./b2 -j3 libs/assert/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}}