Skip to content

Commit a21ad51

Browse files
authored
Merge pull request boostorg#179 from sdarwin/feature/gha_fix_1
Update GitHub Actions CI file
2 parents 2041cfc + 4ff6860 commit a21ad51

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 7 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: ""
@@ -33,7 +34,8 @@ jobs:
3334
buildtype: "boost"
3435
packages: "g++-5"
3536
packages_to_remove: ""
36-
os: "ubuntu-16.04"
37+
os: "ubuntu-20.04"
38+
container: "ubuntu:16.04"
3739
cxx: "g++-5"
3840
sources: ""
3941
llvm_os: ""
@@ -45,7 +47,8 @@ jobs:
4547
buildtype: "boost"
4648
packages: "g++-6"
4749
packages_to_remove: ""
48-
os: "ubuntu-16.04"
50+
os: "ubuntu-20.04"
51+
container: "ubuntu:16.04"
4952
cxx: "g++-6"
5053
sources: ""
5154
llvm_os: ""
@@ -57,7 +60,8 @@ jobs:
5760
buildtype: "boost"
5861
packages: "g++-7"
5962
packages_to_remove: ""
60-
os: "ubuntu-16.04"
63+
os: "ubuntu-20.04"
64+
container: "ubuntu:16.04"
6165
cxx: "g++-7"
6266
sources: ""
6367
llvm_os: ""
@@ -69,7 +73,7 @@ jobs:
6973
buildtype: "boost"
7074
packages: ""
7175
packages_to_remove: ""
72-
os: "ubuntu-16.04"
76+
os: "ubuntu-18.04"
7377
cxx: "clang++"
7478
sources: ""
7579
llvm_os: ""
@@ -81,7 +85,8 @@ jobs:
8185
buildtype: "boost"
8286
packages: "clang-4.0 libstdc++-6-dev"
8387
packages_to_remove: ""
84-
os: "ubuntu-16.04"
88+
os: "ubuntu-20.04"
89+
container: "ubuntu:16.04"
8590
cxx: "clang++-4.0"
8691
sources: ""
8792
llvm_os: "xenial"
@@ -93,7 +98,8 @@ jobs:
9398
buildtype: "boost"
9499
packages: "clang-5.0 libstdc++-7-dev"
95100
packages_to_remove: ""
96-
os: "ubuntu-16.04"
101+
os: "ubuntu-20.04"
102+
container: "ubuntu:16.04"
97103
cxx: "clang++-5.0"
98104
sources: ""
99105
llvm_os: "xenial"
@@ -109,6 +115,16 @@ jobs:
109115
- name: Check if running in container
110116
if: matrix.container != ''
111117
run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
118+
- name: If running in container, upgrade packages
119+
if: matrix.container != ''
120+
run: |
121+
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
122+
sudo apt-add-repository ppa:git-core/ppa
123+
sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
124+
python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
125+
sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
126+
sudo python3 get-pip.py
127+
sudo /usr/local/bin/pip install cmake
112128
113129
- uses: actions/checkout@v2
114130

0 commit comments

Comments
 (0)