tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Move to Ubuntu Eoan

Browse Source 
Disco has reached EOL and apt-get fails.
This commit is contained in:
Thiago Marcos P. Santos
2020-04-16 14:35:04 +03:00
parent 545a09fcb3
commit aa2e8fbb6a
3 changed files with 43 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/ci/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:disco-20190718
FROM ubuntu:eoan-20200313
ENV DEBIAN_FRONTEND="noninteractive"
ENV ANDROID_HOME="/opt/android"
@@ -20,6 +20,8 @@ RUN set -eu && apt-get install -y \
gzip \
ssh \
tar \
colorized-logs \
python-scipy \
&& apt-get autoremove --purge -y && apt-get clean
# Base dependencies
@@ -120,5 +122,12 @@ RUN set -eu \
&& apt-get install google-cloud-sdk -y \
&& apt-get autoremove --purge -y && apt-get clean
# FIXME: This package should not be needed
# bug looks like run-clang-tidy-8 is broken.
# Remove when Ubuntu Eoan fixes the dependency.
RUN set -eu && apt-get install -y \
python-yaml \
&& apt-get autoremove --purge -y && apt-get clean
# Configure ccache
RUN set -eu && /usr/sbin/update-ccache-symlinks

20
scripts/ci/etc/apt/sources.list
View File

@@ -1,10 +1,10 @@
deb http://fi.archive.ubuntu.com/ubuntu/ disco main restricted
deb http://fi.archive.ubuntu.com/ubuntu/ disco-updates main restricted
deb http://fi.archive.ubuntu.com/ubuntu/ disco universe
deb http://fi.archive.ubuntu.com/ubuntu/ disco-updates universe
deb http://fi.archive.ubuntu.com/ubuntu/ disco multiverse
deb http://fi.archive.ubuntu.com/ubuntu/ disco-updates multiverse
deb http://fi.archive.ubuntu.com/ubuntu/ disco-backports main restricted universe multiverse
deb http://security.ubuntu.com/ubuntu/ disco-security main restricted
deb http://security.ubuntu.com/ubuntu/ disco-security universe
deb http://security.ubuntu.com/ubuntu/ disco-security multiverse
deb http://fi.archive.ubuntu.com/ubuntu/ eoan main restricted
deb http://fi.archive.ubuntu.com/ubuntu/ eoan-updates main restricted
deb http://fi.archive.ubuntu.com/ubuntu/ eoan universe
deb http://fi.archive.ubuntu.com/ubuntu/ eoan-updates universe
deb http://fi.archive.ubuntu.com/ubuntu/ eoan multiverse
deb http://fi.archive.ubuntu.com/ubuntu/ eoan-updates multiverse
deb http://fi.archive.ubuntu.com/ubuntu/ eoan-backports main restricted universe multiverse
deb http://security.ubuntu.com/ubuntu/ eoan-security main restricted
deb http://security.ubuntu.com/ubuntu/ eoan-security universe
deb http://security.ubuntu.com/ubuntu/ eoan-security multiverse