|
21 | 21 | buildtype: "boost" |
22 | 22 | packages: "" |
23 | 23 | packages_to_remove: "" |
24 | | - os: "ubuntu-16.04" |
| 24 | + os: "ubuntu-20.04" |
| 25 | + container: "ubuntu:16.04" |
25 | 26 | cxx: "g++" |
26 | 27 | sources: "" |
27 | 28 | llvm_os: "" |
|
34 | 35 | - name: Check if running in container |
35 | 36 | if: matrix.container != '' |
36 | 37 | run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV |
| 38 | + - name: If running in container, upgrade packages |
| 39 | + if: matrix.container != '' |
| 40 | + run: | |
| 41 | + apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 ccache libpython-dev |
| 42 | + sudo apt-add-repository ppa:git-core/ppa |
| 43 | + sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git |
| 44 | + python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))') |
| 45 | + sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py |
| 46 | + sudo python3 get-pip.py |
| 47 | + sudo /usr/local/bin/pip install cmake |
37 | 48 |
|
38 | 49 | - uses: actions/checkout@v2 |
39 | 50 |
|
|
93 | 104 | echo '==================================> INSTALL' |
94 | 105 |
|
95 | 106 | cd .. |
96 | | - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root |
| 107 | + BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true |
| 108 | + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root |
97 | 109 | cd boost-root |
98 | 110 | git submodule update --init tools/build |
99 | 111 | git submodule update --init libs/config |
@@ -171,7 +183,8 @@ jobs: |
171 | 183 | echo '==================================> INSTALL' |
172 | 184 |
|
173 | 185 | cd .. |
174 | | - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root |
| 186 | + BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true |
| 187 | + git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root |
175 | 188 | cd boost-root |
176 | 189 | git submodule update --init tools/build |
177 | 190 | git submodule update --init libs/config |
|
0 commit comments