Skip to content

Commit 4274e6e

Browse files
authored
upgrade ubuntu 16.04 (not supported starting dec 2021) => 18.04; revive Linux_i386 (nim-lang#18107)
1 parent a6bd6c7 commit 4274e6e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.gitlab-ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
image: ubuntu:16.04
1+
# xxx unused, out of date
2+
3+
image: ubuntu:18.04
24

35
stages:
46
- pre-build

azure-pipelines.yml

+7-7
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ jobs:
1919
strategy:
2020
matrix:
2121
Linux_amd64:
22-
vmImage: 'ubuntu-16.04'
22+
vmImage: 'ubuntu-18.04'
2323
CPU: amd64
24-
# pending bug #17325 (broken again)
25-
# Linux_i386:
26-
# # bug #17325: fails on 'ubuntu-16.04' because it now errors with:
27-
# # g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed
28-
# vmImage: 'ubuntu-18.04'
29-
# CPU: i386
24+
# regularly breaks, refs bug #17325
25+
Linux_i386:
26+
# on 'ubuntu-16.04' (not supported anymore anyways) it errored with:
27+
# g++-multilib : Depends: gcc-multilib (>= 4:5.3.1-1ubuntu1) but it is not going to be installed
28+
vmImage: 'ubuntu-18.04'
29+
CPU: i386
3030
OSX_amd64:
3131
vmImage: 'macOS-10.15'
3232
CPU: amd64

0 commit comments

Comments
 (0)