aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stapelberg <stapelberg@users.noreply.github.com>2023-01-02 12:10:36 +0100
committerGitHub <noreply@github.com>2023-01-02 12:10:36 +0100
commit944a262688a44952f9e15dd44427b2cdb78ddf26 (patch)
tree5902bfcf309021c69e13353240eaca848ffdf054
parentaaee2b3eaefcb42414d72cbcf656eae06c3adb75 (diff)
downloadi3-944a262688a44952f9e15dd44427b2cdb78ddf26.tar.gz
i3-944a262688a44952f9e15dd44427b2cdb78ddf26.zip
GitHub Actions: build Ubuntu packages using Ubuntu focal (#5344)
This is required to satisfy our meson.build minimal Meson version.
-rw-r--r--travis/travis-base-ubuntu-386.Dockerfile2
-rw-r--r--travis/travis-base-ubuntu.Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/travis/travis-base-ubuntu-386.Dockerfile b/travis/travis-base-ubuntu-386.Dockerfile
index 4a41fe3e..0ccc55ea 100644
--- a/travis/travis-base-ubuntu-386.Dockerfile
+++ b/travis/travis-base-ubuntu-386.Dockerfile
@@ -1,7 +1,7 @@
# vim:ft=Dockerfile
# Same as travis-base.Dockerfile, but without the test suite dependencies since
# we only build Debian packages on Ubuntu i386, we don’t run the tests.
-FROM i386/ubuntu:bionic
+FROM i386/ubuntu:focal
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
# Paper over occasional network flakiness of some mirrors.
diff --git a/travis/travis-base-ubuntu.Dockerfile b/travis/travis-base-ubuntu.Dockerfile
index 8523b92c..c99cd603 100644
--- a/travis/travis-base-ubuntu.Dockerfile
+++ b/travis/travis-base-ubuntu.Dockerfile
@@ -1,7 +1,7 @@
# vim:ft=Dockerfile
# Same as travis-base.Dockerfile, but without the test suite dependencies since
# we only build Debian packages on Ubuntu, we don’t run the tests.
-FROM ubuntu:bionic
+FROM ubuntu:focal
RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
# Paper over occasional network flakiness of some mirrors.