Skip to content

Commit d59fe28

Browse files
sdarwinsdarwin
committed
Update GitHub Actions CI file
1 parent 584659a commit d59fe28

File tree

1 file changed

+48
-20
lines changed

1 file changed

+48
-20
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 48 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ jobs:
3434
buildtype: "boost"
3535
packages: "g++-4.6"
3636
packages_to_remove: ""
37-
os: "ubuntu-16.04"
37+
os: "ubuntu-20.04"
38+
container: "ubuntu:16.04"
3839
cxx: "g++"
3940
sources: ""
4041
llvm_os: ""
@@ -46,7 +47,8 @@ jobs:
4647
buildtype: "boost"
4748
packages: "g++-4.7"
4849
packages_to_remove: ""
49-
os: "ubuntu-16.04"
50+
os: "ubuntu-20.04"
51+
container: "ubuntu:16.04"
5052
cxx: "g++-4.7"
5153
sources: ""
5254
llvm_os: ""
@@ -58,7 +60,8 @@ jobs:
5860
buildtype: "boost"
5961
packages: "g++-4.8"
6062
packages_to_remove: ""
61-
os: "ubuntu-16.04"
63+
os: "ubuntu-20.04"
64+
container: "ubuntu:16.04"
6265
cxx: "g++-4.8"
6366
sources: ""
6467
llvm_os: ""
@@ -70,7 +73,8 @@ jobs:
7073
buildtype: "boost"
7174
packages: "g++-4.9"
7275
packages_to_remove: ""
73-
os: "ubuntu-16.04"
76+
os: "ubuntu-20.04"
77+
container: "ubuntu:16.04"
7478
cxx: "g++-4.9"
7579
sources: ""
7680
llvm_os: ""
@@ -82,7 +86,8 @@ jobs:
8286
buildtype: "boost"
8387
packages: "g++-5"
8488
packages_to_remove: ""
85-
os: "ubuntu-16.04"
89+
os: "ubuntu-20.04"
90+
container: "ubuntu:16.04"
8691
cxx: "g++-5"
8792
sources: ""
8893
llvm_os: ""
@@ -94,7 +99,8 @@ jobs:
9499
buildtype: "boost"
95100
packages: "g++-6"
96101
packages_to_remove: ""
97-
os: "ubuntu-16.04"
102+
os: "ubuntu-20.04"
103+
container: "ubuntu:16.04"
98104
cxx: "g++-6"
99105
sources: ""
100106
llvm_os: ""
@@ -106,7 +112,8 @@ jobs:
106112
buildtype: "boost"
107113
packages: "g++-6"
108114
packages_to_remove: ""
109-
os: "ubuntu-16.04"
115+
os: "ubuntu-20.04"
116+
container: "ubuntu:16.04"
110117
cxx: "g++-6"
111118
sources: ""
112119
llvm_os: ""
@@ -119,7 +126,8 @@ jobs:
119126
buildtype: "boost"
120127
packages: "g++-7"
121128
packages_to_remove: ""
122-
os: "ubuntu-16.04"
129+
os: "ubuntu-20.04"
130+
container: "ubuntu:16.04"
123131
cxx: "g++-7"
124132
sources: ""
125133
llvm_os: ""
@@ -131,7 +139,8 @@ jobs:
131139
buildtype: "boost"
132140
packages: "g++-7"
133141
packages_to_remove: ""
134-
os: "ubuntu-16.04"
142+
os: "ubuntu-20.04"
143+
container: "ubuntu:16.04"
135144
cxx: "g++-7"
136145
sources: ""
137146
llvm_os: ""
@@ -144,7 +153,8 @@ jobs:
144153
buildtype: "boost"
145154
packages: "g++-8"
146155
packages_to_remove: ""
147-
os: "ubuntu-16.04"
156+
os: "ubuntu-20.04"
157+
container: "ubuntu:16.04"
148158
cxx: "g++-8"
149159
sources: ""
150160
llvm_os: ""
@@ -156,7 +166,8 @@ jobs:
156166
buildtype: "boost"
157167
packages: "clang-3.5"
158168
packages_to_remove: ""
159-
os: "ubuntu-16.04"
169+
os: "ubuntu-20.04"
170+
container: "ubuntu:16.04"
160171
cxx: "clang++-3.5"
161172
sources: ""
162173
llvm_os: "precise"
@@ -168,7 +179,8 @@ jobs:
168179
buildtype: "boost"
169180
packages: "clang-3.6"
170181
packages_to_remove: ""
171-
os: "ubuntu-16.04"
182+
os: "ubuntu-20.04"
183+
container: "ubuntu:16.04"
172184
cxx: "clang++-3.6"
173185
sources: ""
174186
llvm_os: "precise"
@@ -180,7 +192,8 @@ jobs:
180192
buildtype: "boost"
181193
packages: "clang-3.7"
182194
packages_to_remove: ""
183-
os: "ubuntu-16.04"
195+
os: "ubuntu-20.04"
196+
container: "ubuntu:16.04"
184197
cxx: "clang++-3.7"
185198
sources: ""
186199
llvm_os: "precise"
@@ -192,7 +205,8 @@ jobs:
192205
buildtype: "boost"
193206
packages: "clang-3.8 libstdc++-4.9-dev"
194207
packages_to_remove: ""
195-
os: "ubuntu-16.04"
208+
os: "ubuntu-20.04"
209+
container: "ubuntu:16.04"
196210
cxx: "clang++-3.8"
197211
sources: ""
198212
llvm_os: "precise"
@@ -204,7 +218,8 @@ jobs:
204218
buildtype: "boost"
205219
packages: "clang-3.9 libstdc++-4.9-dev"
206220
packages_to_remove: ""
207-
os: "ubuntu-16.04"
221+
os: "ubuntu-20.04"
222+
container: "ubuntu:16.04"
208223
cxx: "clang++-3.9"
209224
sources: ""
210225
llvm_os: "precise"
@@ -216,7 +231,8 @@ jobs:
216231
buildtype: "boost"
217232
packages: "clang-4.0"
218233
packages_to_remove: ""
219-
os: "ubuntu-16.04"
234+
os: "ubuntu-20.04"
235+
container: "ubuntu:16.04"
220236
cxx: "clang++-4.0"
221237
sources: ""
222238
llvm_os: "xenial"
@@ -228,7 +244,8 @@ jobs:
228244
buildtype: "boost"
229245
packages: "clang-5.0"
230246
packages_to_remove: ""
231-
os: "ubuntu-16.04"
247+
os: "ubuntu-20.04"
248+
container: "ubuntu:16.04"
232249
cxx: "clang++-5.0"
233250
sources: ""
234251
llvm_os: "xenial"
@@ -240,7 +257,8 @@ jobs:
240257
buildtype: "boost"
241258
packages: "clang-6.0"
242259
packages_to_remove: ""
243-
os: "ubuntu-16.04"
260+
os: "ubuntu-20.04"
261+
container: "ubuntu:16.04"
244262
cxx: "clang++-6.0"
245263
sources: ""
246264
llvm_os: "xenial"
@@ -252,7 +270,7 @@ jobs:
252270
buildtype: "boost"
253271
packages: "libstdc++-5-dev"
254272
packages_to_remove: ""
255-
os: "ubuntu-16.04"
273+
os: "ubuntu-18.04"
256274
cxx: "clang++"
257275
sources: ""
258276
llvm_os: ""
@@ -264,7 +282,7 @@ jobs:
264282
buildtype: "boost"
265283
packages: " libc++-9-dev libc++abi-9-dev"
266284
packages_to_remove: "libc++-dev libc++abi-dev"
267-
os: "ubuntu-16.04"
285+
os: "ubuntu-18.04"
268286
cxx: "clang++-libc++"
269287
sources: ""
270288
llvm_os: "xenial"
@@ -280,6 +298,16 @@ jobs:
280298
- name: Check if running in container
281299
if: matrix.container != ''
282300
run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
301+
- name: If running in container, upgrade packages
302+
if: matrix.container != ''
303+
run: |
304+
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
305+
sudo apt-add-repository ppa:git-core/ppa
306+
sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
307+
python_version=$(python3 -c 'import sys; print("{0.major}.{0.minor}".format(sys.version_info))')
308+
sudo wget https://bootstrap.pypa.io/pip/$python_version/get-pip.py
309+
sudo python3 get-pip.py
310+
sudo /usr/local/bin/pip install cmake
283311
284312
- uses: actions/checkout@v2
285313

0 commit comments

Comments
 (0)