Skip to content

Commit 76db5be

Browse files
committed
Update GitHub Actions CI file
1 parent d5d7a5b commit 76db5be

File tree

1 file changed

+16
-3
lines changed

1 file changed

+16
-3
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
buildtype: "boost"
2222
packages: ""
2323
packages_to_remove: ""
24-
os: "ubuntu-16.04"
24+
os: "ubuntu-20.04"
25+
container: "ubuntu:16.04"
2526
cxx: "g++"
2627
sources: ""
2728
llvm_os: ""
@@ -34,6 +35,16 @@ jobs:
3435
- name: Check if running in container
3536
if: matrix.container != ''
3637
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
3748
3849
- uses: actions/checkout@v2
3950

@@ -93,7 +104,8 @@ jobs:
93104
echo '==================================> INSTALL'
94105
95106
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
97109
cd boost-root
98110
git submodule update --init tools/build
99111
git submodule update --init libs/config
@@ -171,7 +183,8 @@ jobs:
171183
echo '==================================> INSTALL'
172184
173185
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
175188
cd boost-root
176189
git submodule update --init tools/build
177190
git submodule update --init libs/config

0 commit comments

Comments
 (0)