Merge branch 'master' into utxo-retaddr

kaspanet · Jan 6, 2025 · 2f796b9 · 2f796b9
2 parents 0029ed3 + ecbd6f3
commit 2f796b9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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