From ecbd6f3163bf63ce475b77d1a4e598f18271c18d Mon Sep 17 00:00:00 2001
From: Alexander Saefstroem <139136798+saefstroem@users.noreply.github.com>
Date: Mon, 6 Jan 2025 15:56:11 +0100
Subject: [PATCH] CI Update (#622)

* Update python version for Ubuntu 24.04 Noble

Due to the upgrade of Ubuntu version that is used in the CI we must upgrade the Python version to be compatible with Ubuntu 24.04 Noble. It could be relevant in the future to lock the Ubuntu version but that is a minor issue.

* Only remove images if there are any
---
 .github/workflows/ci.yaml | 4 +++-
 musl-toolchain/build.sh   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c9aa2a2673..9b1e99a1cb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -44,7 +44,9 @@ jobs:
       # Clean unnecessary files to save disk space
       - name: clean unnecessary files to save space
         run: |
-          docker rmi `docker images -q`
+          if [ "$(docker images -q)" ]; then
+            docker rmi $(docker images -q)
+          fi
           sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/sudo apt/sources.list.d
           sudo apt -y autoremove --purge
           sudo apt -y autoclean
diff --git a/musl-toolchain/build.sh b/musl-toolchain/build.sh
index b32314082b..1e114a9c5b 100755
--- a/musl-toolchain/build.sh
+++ b/musl-toolchain/build.sh
@@ -17,7 +17,7 @@ source preset.sh
 if [ ! -d "$HOME/x-tools" ] || [ ! -f "$PRESET_HASH_FILE" ] || [ "$(cat $PRESET_HASH_FILE)" != "$CURRENT_PRESET_HASH" ]; then
   # Install dependencies
   sudo apt-get update
-  sudo apt-get install -y autoconf automake libtool  libtool-bin unzip help2man python3.10-dev gperf bison flex texinfo gawk libncurses5-dev
+  sudo apt-get install -y autoconf automake libtool  libtool-bin unzip help2man python3-dev gperf bison flex texinfo gawk libncurses5-dev
   
   # Clone crosstool-ng
   git clone https://github.com/crosstool-ng/crosstool-ng