From 2313ec08eeb05c2991cd5935312658668e0ffc4a Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 5 Dec 2023 17:40:39 +0100
Subject: [PATCH] More CI fixes

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/bootstrap-deps.sh |  3 ++-
 .github/workflows/bootstrap.yml     | 31 +++++++++++++++--------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh
index 4e442bd..f6ecc23 100755
--- a/.github/workflows/bootstrap-deps.sh
+++ b/.github/workflows/bootstrap-deps.sh
@@ -85,7 +85,7 @@ case "${1}" in
     ;;
     *)
         apt-get update -qq
-        apt-get install -yqq autoconf automake autopoint build-essential curl cmake dpkg-dev file git jq libtool lsb-release meson gperf patchelf
+        apt-get install -yqq autoconf automake autopoint build-essential curl cmake dpkg-dev file git jq libtool lsb-release meson gperf patchelf zlib1g-dev
 
         arch=$(get_linux_deb_arch "${1}")
         release=$(lsb_release -cs 2>/dev/null)
@@ -110,6 +110,7 @@ case "${1}" in
                 libdbus-1-dev:${arch} \
                 libgl1-mesa-dev:${arch} \
                 libglib2.0-dev:${arch} \
+                libglib2.0-dev-bin:${arch} \
                 libpcre2-dev:${arch} \
                 libpcre3-dev:${arch} \
                 libx11-dev:${arch} \
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 50ee1d2..30e9048 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -719,21 +719,22 @@ jobs:
       matrix:
         include:
           # ubuntu:20.04
-          - target: linux-aarch64
-            container: ubuntu:20.04
-            os: ubuntu-latest
-          - target: linux-armhf
-            container: ubuntu:20.04
-            os: ubuntu-latest
-          - target: linux-i686
-            container: ubuntu:20.04
-            os: ubuntu-latest
-          - target: linux-riscv64
-            container: ubuntu:20.04
-            os: ubuntu-latest
-          - target: linux-x86_64
-            container: ubuntu:20.04
-            os: ubuntu-latest
+          # FIXME Cannot use the installed version of file (5.38) to cross-compile file 5.34
+          #- target: linux-aarch64
+            #container: ubuntu:20.04
+            #os: ubuntu-latest
+          #- target: linux-armhf
+            #container: ubuntu:20.04
+            #os: ubuntu-latest
+          #- target: linux-i686
+            #container: ubuntu:20.04
+            #os: ubuntu-latest
+          #- target: linux-riscv64
+            #container: ubuntu:20.04
+            #os: ubuntu-latest
+          #- target: linux-x86_64
+            #container: ubuntu:20.04
+            #os: ubuntu-latest
           - target: macos-universal-10.15
             os: macos-11
           - target: wasm