Skip to content

Commit a9a3dbb

Browse files
mclowmclow
authored
Merge pull request #16 from sdarwin/feature/gha_fix_1
Update GitHub Actions CI file
2 parents 63f83dc + e384e37 commit a9a3dbb

File tree

1 file changed

+41
-16
lines changed

1 file changed

+41
-16
lines changed

‎.github/workflows/ci.yml

+41-16
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ jobs:
2121
buildtype: "96ad197d74-2319b6d45f"
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: ""
@@ -31,7 +32,8 @@ jobs:
3132
buildtype: "boost"
3233
packages: ""
3334
packages_to_remove: ""
34-
os: "ubuntu-16.04"
35+
os: "ubuntu-20.04"
36+
container: "ubuntu:16.04"
3537
cxx: "g++"
3638
sources: ""
3739
llvm_os: ""
@@ -43,7 +45,8 @@ jobs:
4345
buildtype: "boost"
4446
packages: "g++-4.7"
4547
packages_to_remove: ""
46-
os: "ubuntu-16.04"
48+
os: "ubuntu-20.04"
49+
container: "ubuntu:16.04"
4750
cxx: "g++-4.7"
4851
sources: ""
4952
llvm_os: ""
@@ -55,7 +58,8 @@ jobs:
5558
buildtype: "boost"
5659
packages: "g++-4.8"
5760
packages_to_remove: ""
58-
os: "ubuntu-16.04"
61+
os: "ubuntu-20.04"
62+
container: "ubuntu:16.04"
5963
cxx: "g++-4.8"
6064
sources: ""
6165
llvm_os: ""
@@ -67,7 +71,8 @@ jobs:
6771
buildtype: "boost"
6872
packages: "g++-4.9"
6973
packages_to_remove: ""
70-
os: "ubuntu-16.04"
74+
os: "ubuntu-20.04"
75+
container: "ubuntu:16.04"
7176
cxx: "g++-4.9"
7277
sources: ""
7378
llvm_os: ""
@@ -79,7 +84,8 @@ jobs:
7984
buildtype: "boost"
8085
packages: "g++-5"
8186
packages_to_remove: ""
82-
os: "ubuntu-16.04"
87+
os: "ubuntu-20.04"
88+
container: "ubuntu:16.04"
8389
cxx: "g++-5"
8490
sources: ""
8591
llvm_os: ""
@@ -91,7 +97,8 @@ jobs:
9197
buildtype: "boost"
9298
packages: "g++-6"
9399
packages_to_remove: ""
94-
os: "ubuntu-16.04"
100+
os: "ubuntu-20.04"
101+
container: "ubuntu:16.04"
95102
cxx: "g++-6"
96103
sources: ""
97104
llvm_os: ""
@@ -103,7 +110,8 @@ jobs:
103110
buildtype: "boost"
104111
packages: "g++-7"
105112
packages_to_remove: ""
106-
os: "ubuntu-16.04"
113+
os: "ubuntu-20.04"
114+
container: "ubuntu:16.04"
107115
cxx: "g++-7"
108116
sources: ""
109117
llvm_os: ""
@@ -115,7 +123,7 @@ jobs:
115123
buildtype: "boost"
116124
packages: ""
117125
packages_to_remove: ""
118-
os: "ubuntu-16.04"
126+
os: "ubuntu-18.04"
119127
cxx: "clang++"
120128
sources: ""
121129
llvm_os: ""
@@ -127,7 +135,8 @@ jobs:
127135
buildtype: "boost"
128136
packages: "clang-3.5 libstdc++-4.9-dev"
129137
packages_to_remove: ""
130-
os: "ubuntu-16.04"
138+
os: "ubuntu-20.04"
139+
container: "ubuntu:16.04"
131140
cxx: "clang++-3.5"
132141
sources: ""
133142
llvm_os: "precise"
@@ -139,7 +148,8 @@ jobs:
139148
buildtype: "boost"
140149
packages: "clang-3.6"
141150
packages_to_remove: ""
142-
os: "ubuntu-16.04"
151+
os: "ubuntu-20.04"
152+
container: "ubuntu:16.04"
143153
cxx: "clang++-3.6"
144154
sources: ""
145155
llvm_os: "precise"
@@ -151,7 +161,8 @@ jobs:
151161
buildtype: "boost"
152162
packages: "clang-3.7"
153163
packages_to_remove: ""
154-
os: "ubuntu-16.04"
164+
os: "ubuntu-20.04"
165+
container: "ubuntu:16.04"
155166
cxx: "clang++-3.7"
156167
sources: ""
157168
llvm_os: "precise"
@@ -163,7 +174,8 @@ jobs:
163174
buildtype: "boost"
164175
packages: "clang-3.8 libstdc++-4.9-dev"
165176
packages_to_remove: ""
166-
os: "ubuntu-16.04"
177+
os: "ubuntu-20.04"
178+
container: "ubuntu:16.04"
167179
cxx: "clang++-3.8"
168180
sources: ""
169181
llvm_os: "precise"
@@ -175,7 +187,8 @@ jobs:
175187
buildtype: "boost"
176188
packages: "clang-3.9 libstdc++-4.9-dev"
177189
packages_to_remove: ""
178-
os: "ubuntu-16.04"
190+
os: "ubuntu-20.04"
191+
container: "ubuntu:16.04"
179192
cxx: "clang++-3.9"
180193
sources: ""
181194
llvm_os: "precise"
@@ -187,7 +200,8 @@ jobs:
187200
buildtype: "boost"
188201
packages: "clang-4.0"
189202
packages_to_remove: ""
190-
os: "ubuntu-16.04"
203+
os: "ubuntu-20.04"
204+
container: "ubuntu:16.04"
191205
cxx: "clang++-4.0"
192206
sources: ""
193207
llvm_os: "xenial"
@@ -199,7 +213,8 @@ jobs:
199213
buildtype: "boost"
200214
packages: "clang-5.0"
201215
packages_to_remove: ""
202-
os: "ubuntu-16.04"
216+
os: "ubuntu-20.04"
217+
container: "ubuntu:16.04"
203218
cxx: "clang++-5.0"
204219
sources: ""
205220
llvm_os: "xenial"
@@ -215,6 +230,16 @@ jobs:
215230
- name: Check if running in container
216231
if: matrix.container != ''
217232
run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
233+
- name: If running in container, upgrade packages
234+
if: matrix.container != ''
235+
run: |
236+
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
237+
sudo apt-add-repository ppa:git-core/ppa
238+
sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
239+
python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
240+
sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
241+
sudo python3 get-pip.py
242+
sudo /usr/local/bin/pip install cmake
218243
219244
- uses: actions/checkout@v2
220245

0 commit comments

Comments
 (0)