From 089b8210989411a5d6602beec1636e17204850a3 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 14 Mar 2022 09:21:15 -0400
Subject: [PATCH 1/2] ci: Disable Ubuntu LTS

It doesn't have a new enough glib.
---
 .github/workflows/tests.yml | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 76b3967b..13e33535 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -94,11 +94,12 @@ jobs:
           # the devel tag, which is the unreleased version.
           #
           # https://hub.docker.com/_/ubuntu
-          - name: Ubuntu Latest LTS
-            image: ubuntu:latest
-            pre-checkout-setup: |
-              apt-get update
-              apt-get install -y git
+          # For now, this is disabled because its glib version is too old.
+          # - name: Ubuntu Latest LTS
+          #   image: ubuntu:latest
+          #   pre-checkout-setup: |
+          #     apt-get update
+          #     apt-get install -y git
 
           - name: Ubuntu Latest Release
             image: ubuntu:rolling

From e6f92f76fad0bae435088f649797fc02cd93b458 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Mon, 14 Mar 2022 09:27:07 -0400
Subject: [PATCH 2/2] ci: Update docs workflow to use fcos-buildroot

This way we can also use `./ci/installdeps.sh` which avoids yet
another list of dependencies.
---
 .github/workflows/docs.yml | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 74f5e9d6..fe120fde 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -16,6 +16,7 @@ jobs:
   docs:
     name: Build documentation
     runs-on: ubuntu-latest
+    container: registry.ci.openshift.org/coreos/fcos-buildroot:testing-devel
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -23,39 +24,7 @@ jobs:
       # This is taken from ci/travis-install.sh but should probably be
       # refactored.
       - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y \
-            attr \
-            bison \
-            cpio \
-            debhelper \
-            dh-autoreconf \
-            dh-systemd \
-            docbook-xml \
-            docbook-xsl \
-            e2fslibs-dev \
-            elfutils \
-            fuse \
-            gjs \
-            gnome-desktop-testing \
-            gobject-introspection \
-            gtk-doc-tools \
-            libarchive-dev \
-            libattr1-dev \
-            libcap-dev \
-            libfuse-dev \
-            libgirepository1.0-dev \
-            libglib2.0-dev \
-            libgpgme11-dev \
-            liblzma-dev \
-            libmount-dev \
-            libselinux1-dev \
-            libsoup2.4-dev \
-            libcurl4-openssl-dev \
-            procps \
-            zlib1g-dev \
-            python3-yaml
+        run: ./ci/installdeps.sh
 
       - name: Build API docs
         run: |