From 29f262c4a191ab77161e6e240dc26770c2479dce Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 7 Dec 2023 14:29:33 +0100
Subject: [PATCH] Update cmake and meson via pip

Signed-off-by: falkTX <falktx@falktx.com>
---
 .github/workflows/bootstrap-deps.sh | 13 +++----
 .github/workflows/bootstrap.yml     | 53 +++++++++++++----------------
 2 files changed, 28 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/bootstrap-deps.sh b/.github/workflows/bootstrap-deps.sh
index 92a032e..6ebe907 100755
--- a/.github/workflows/bootstrap-deps.sh
+++ b/.github/workflows/bootstrap-deps.sh
@@ -120,15 +120,10 @@ case "${1}" in
         fi
 
         case "${release}" in
-            "bionic"|"focal")
-                apt-get install -yqq python3-pkg-resources
-                curl -sOL https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/meson_0.56.0-1kxstudio4_all.deb
-                if [ "${release}" = "bionic" ]; then
-                    curl -sOL https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/cmake_3.13.4-1kxstudio1_$(dpkg-architecture -qDEB_HOST_ARCH).deb
-                    curl -sOL https://launchpad.net/~kxstudio-debian/+archive/ubuntu/toolchain/+files/cmake-data_3.13.4-1kxstudio1_all.deb
-                fi
-                dpkg -i *.deb
-                rm *.deb
+            "bionic"|"bookworm"|"focal")
+                apt-get install -yqq --no-install-recommends python3-pip
+                pip3 install --isolated --upgrade pip
+                pip3 install --isolated --upgrade cmake meson
             ;;
         esac
 
diff --git a/.github/workflows/bootstrap.yml b/.github/workflows/bootstrap.yml
index 2c14e3f..e653e50 100644
--- a/.github/workflows/bootstrap.yml
+++ b/.github/workflows/bootstrap.yml
@@ -237,19 +237,18 @@ jobs:
             container: debian:12
             os: ubuntu-latest
           # ubuntu:18.04
-          # FIXME needs CMake 3.15
-          #- target: linux-aarch64
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
-          #- target: linux-armhf
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
-          #- target: linux-i686
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
-          #- target: linux-x86_64
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
+          - target: linux-aarch64
+            container: ubuntu:18.04
+            os: ubuntu-latest
+          - target: linux-armhf
+            container: ubuntu:18.04
+            os: ubuntu-latest
+          - target: linux-i686
+            container: ubuntu:18.04
+            os: ubuntu-latest
+          - target: linux-x86_64
+            container: ubuntu:18.04
+            os: ubuntu-latest
           # ubuntu:20.04
           - target: linux-aarch64
             container: ubuntu:20.04
@@ -795,13 +794,12 @@ jobs:
           - target: macos-universal-10.15
             os: macos-12
           # debian 11
-          # FIXME debian:11 needs meson 0.58
-          #- target: linux-x86_64
-            #container: debian:11
-            #os: ubuntu-latest
-          #- target: win64
-            #container: debian:11
-            #os: ubuntu-latest
+          - target: linux-x86_64
+            container: debian:11
+            os: ubuntu-latest
+          - target: win64
+            container: debian:11
+            os: ubuntu-latest
           # debian 12
           - target: linux-x86_64
             container: debian:12
@@ -811,16 +809,13 @@ jobs:
             #container: debian:12
             #os: ubuntu-latest
           # ubuntu 18.04
-          # FIXME ubuntu:18.04 needs CMake 3.15
-          # FIXME ubuntu:18.04 needs meson 0.58
-          #- target: linux-x86_64
-            #container: ubuntu:18.04
-            #os: ubuntu-latest
+          - target: linux-x86_64
+            container: ubuntu:18.04
+            os: ubuntu-latest
           # ubuntu 20.04
-          # FIXME ubuntu:20.04 needs meson 0.58
-          #- target: linux-x86_64
-            #container: ubuntu:20.04
-            #os: ubuntu-latest
+          - target: linux-x86_64
+            container: ubuntu:20.04
+            os: ubuntu-latest
           # ubuntu 22.04
           - target: linux-x86_64
             container: ubuntu:22.04