Change the Eoan CI to ubuntu rolling ci

This makes the Ubuntu CI always use the latest release, without us
having to manually change it.

3 files changed, 3 insertions, 5 deletions

diff --git a/ci/ciimage/eoan/image.json b/ci/ciimage/ubuntu-rolling/image.json
index cbf86c3..038b945 100644
--- a/ci/ciimage/eoan/image.json
+++ b/ci/ciimage/ubuntu-rolling/image.json
@@ -1,5 +1,5 @@
 {
-  "base_image": "ubuntu:eoan",
+  "base_image": "ubuntu:rolling",
   "env": {
     "CI": "1",
     "DC": "gdc"
diff --git a/ci/ciimage/eoan/install.sh b/ci/ciimage/ubuntu-rolling/install.sh
index 36dec72..507113b 100755
--- a/ci/ciimage/eoan/install.sh
+++ b/ci/ciimage/ubuntu-rolling/install.sh
@@ -9,14 +9,12 @@ export LANG='C.UTF-8'
 export DC=gdc
 
 pkgs=(
-  python3-pytest-xdist
+  python3-pytest-xdist python3-jsonschema
   python3-pip libxml2-dev libxslt1-dev libyaml-dev libjson-glib-dev
   python3-lxml
   wget unzip
   qt5-default clang
   pkg-config-arm-linux-gnueabihf
-  qt4-linguist-tools
-  python-dev
   libomp-dev
   llvm lcov
   dub ldc
@@ -43,7 +41,7 @@ eatmydata apt-get -y build-dep meson
 eatmydata apt-get -y install "${pkgs[@]}"
 eatmydata apt-get -y install --no-install-recommends wine-stable  # Wine is special
 
-eatmydata python3 -m pip install hotdoc codecov gcovr jsonschema
+eatmydata python3 -m pip install hotdoc codecov gcovr
 
 # dub stuff
 dub_fetch urld
diff --git a/ci/ciimage/eoan/test.sh b/ci/ciimage/ubuntu-rolling/test.sh
index d00df6f..d00df6f 100755
--- a/ci/ciimage/eoan/test.sh
+++ b/ci/ciimage/ubuntu-rolling/test.sh