- update android build runner

- sailfishos dropped (you better go behave yourself and run actual linux programs)
- fiz pigz issues

2 files changed, 6 insertions, 127 deletions

diff --git a/.github/workflows/full_check.yaml b/.github/workflows/full_check.yaml
index d30121c..8f4bac6 100644
--- a/.github/workflows/full_check.yaml
+++ b/.github/workflows/full_check.yaml
@@ -65,7 +65,7 @@ jobs:
       fail-fast: false
       matrix:
         coin: [monero, wownero]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     # container:
     #   image: debian:bookworm
     steps:
@@ -83,7 +83,7 @@ jobs:
       - name: Install dependencies
         run: |
           sudo apt update
-          sudo apt install -y pigz build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo5 gperf unzip python-is-python3
+          sudo apt install -y pigz build-essential pkg-config autoconf libtool ccache make cmake gcc g++ git curl lbzip2 libtinfo6 gperf unzip python-is-python3
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
@@ -191,111 +191,6 @@ jobs:
         with:
           name: linux ${{ matrix.coin }}
           path: release/${{ matrix.coin }}
-  lib_sailfishos_aarch64:
-    strategy:
-      fail-fast: false
-      matrix:
-        coin: [monero, wownero]
-    runs-on: buildjet-2vcpu-ubuntu-2204-arm
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - uses: thejerrybao/setup-swap-space@v1
-        with:
-          swap-space-path: /swapfile
-          swap-size-gb: 8
-          remove-existing-swap-files: true
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Patch sources
-        run: |
-          git config --global --add safe.directory '*'
-          git config --global user.email "ci@mrcyjanek.net"
-          git config --global user.name "CI mrcyjanek.net"
-          ./apply_patches.sh ${{ matrix.coin }}
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.job }}-${{ matrix.coin }}
-      - name: Cache built
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: actions/cache@v4
-        with:
-          path: |
-            contrib/depends/built/*
-          key: depends-${{ github.job }}-${{ hashFiles('*/contrib/depends/packages/*.mk') }}
-      - name: ${{ matrix.coin }}/aarch64-meego-linux-gnu
-        run: |
-          docker run --rm -v $PWD/.ccache:/root/.ccache -v $PWD:$PWD -w $PWD ghcr.io/mrcyjanek/sailfishos:4.6.0.11_target_aarch64 bash -c 'zypper in -f -y perl-IPC-Cmd curl ccache gperf cmake ffmpeg-tools git clang libxkbcommon-devel wayland-protocols-devel wayland-client wayland-egl-devel make glibc-static && git config --global --add safe.directory "*" && for i in gcc g++ ar ranlib; do ln -s /usr/bin/$i /usr/bin/aarch64-meego-linux-gnu-$i; ln -s /usr/bin/$i /usr/bin/aarch64-linux-gnu-$i; done && ./build_single.sh ${{ matrix.coin }} aarch64-meego-linux-gnu -j$(nproc)'
-      - name: rename artifacts
-        run: |
-          sudo mkdir release/gh/
-          for i in release/${{ matrix.coin }}/*
-          do
-              sudo cp "$i" "release/gh/${{ matrix.coin }}_$(basename $i)"
-          done
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: release/gh/*
-          token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
-      - name: Upload lib
-        uses: actions/upload-artifact@v4
-        with:
-          name: sfos aarch64 ${{ matrix.coin }}
-          path: release/${{ matrix.coin }}
-  lib_sailfishos_i486:
-    strategy:
-      fail-fast: false
-      matrix:
-        coin: [monero, wownero]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          submodules: recursive
-      - name: Patch sources
-        run: |
-          git config --global --add safe.directory '*'
-          git config --global user.email "ci@mrcyjanek.net"
-          git config --global user.name "CI mrcyjanek.net"
-          ./apply_patches.sh ${{ matrix.coin }}
-      - name: ccache
-        uses: hendrikmuhs/ccache-action@v1.2
-        with:
-          key: ${{ github.job }}-${{ matrix.coin }}
-      - name: Cache built
-        if: ${{ !startsWith(github.ref, 'refs/tags/v') }}
-        uses: actions/cache@v4
-        with:
-          path: |
-            contrib/depends/built/*
-          key: depends-${{ github.job }}-${{ hashFiles('contrib/depends/packages/*.mk') }}
-      - name: ${{ matrix.coin }}/aarch64-meego-linux-gnu
-        run: |
-          docker run --rm -v $PWD/.ccache:/root/.ccache -v $PWD:$PWD -w $PWD ghcr.io/mrcyjanek/sailfishos:4.6.0.11_target_i486 bash -c 'zypper in -f -y perl-IPC-Cmd curl ccache gperf cmake ffmpeg-tools git clang libxkbcommon-devel wayland-protocols-devel wayland-client wayland-egl-devel make glibc-static && git config --global --add safe.directory "*" && for i in gcc g++ ar ranlib; do ln -s /usr/bin/$i /usr/bin/i686-linux-gnu-$i; ln -s /usr/bin/$i /usr/bin/i686-meego-linux-gnu-$i; done && ./build_single.sh ${{ matrix.coin }} i686-meego-linux-gnu -j$(nproc)'
-      - name: rename artifacts
-        run: |
-          sudo mkdir release/gh/
-          for i in release/${{ matrix.coin }}/*
-          do
-              sudo cp "$i" "release/gh/${{ matrix.coin }}_$(basename $i)"
-          done
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          files: release/gh/*
-          token: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
-      - name: Upload lib
-        uses: actions/upload-artifact@v4
-        with:
-          name: sfos_i486 ${{ matrix.coin }}
-          path: release/${{ matrix.coin }}
   lib_macos:
     strategy:
       fail-fast: false
@@ -315,7 +210,7 @@ jobs:
           xcode-version: '15.4'
       - name: install dependencies
         run: |
-          brew install ccache binutils pigz
+          brew install ccache binutils
       - name: Patch sources
         run: |
           git config --global --add safe.directory '*'
@@ -416,7 +311,7 @@ jobs:
     name: create single release file
     runs-on: ubuntu-latest
     needs: [
-      lib_mingw, lib_android, lib_linux, lib_sailfishos_aarch64, lib_sailfishos_i486, lib_macos, lib_ios
+      lib_mingw, lib_android, lib_linux, lib_macos, lib_ios
     ]
     steps:
       - uses: actions/download-artifact@v4
@@ -459,22 +354,6 @@ jobs:
         with:
           name: mingw wownero
           path: release/wownero
-      - uses: actions/download-artifact@v4
-        with:
-          name: sfos aarch64 monero
-          path: release/monero
-      - uses: actions/download-artifact@v4
-        with:
-          name: sfos aarch64 wownero
-          path: release/wownero
-      - uses: actions/download-artifact@v4
-        with:
-          name: sfos_i486 monero
-          path: release/monero
-      - uses: actions/download-artifact@v4
-        with:
-          name: sfos_i486 wownero
-          path: release/wownero
       - name: zip release dir
         run: zip -r release-bundle.zip release
       - name: Release
diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk
index 493a96c..f98b938 100644
--- a/contrib/depends/funcs.mk
+++ b/contrib/depends/funcs.mk
@@ -221,7 +221,7 @@ $($(1)_preprocessed): | $($(1)_dependencies) $($(1)_extracted)
 	$(AT)touch $$@
 $($(1)_configured): | $($(1)_preprocessed)
 	$(AT)echo Configuring $(1)...
-	$(AT)rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), tar xf $($(package)_cached) -I '$(COMPRESS_CMD)'; )
+	$(AT)rm -rf $(host_prefix); mkdir -p $(host_prefix)/lib; cd $(host_prefix); $(foreach package,$($(1)_all_dependencies), tar xf $($(package)_cached) --use-compress-program='$(COMPRESS_CMD)'; )
 	$(AT)mkdir -p $$(@D)
 	$(AT)+cd $$(@D); $($(1)_config_env) $(call $(1)_config_cmds, $(1))
 	$(AT)touch $$@
@@ -242,7 +242,7 @@ $($(1)_postprocessed): | $($(1)_staged)
 	$(AT)touch $$@
 $($(1)_cached): | $($(1)_dependencies) $($(1)_postprocessed)
 	$(AT)echo Caching $(1)...
-	$(AT)cd $$($(1)_staging_dir)/$(host_prefix); find . | sort | tar --no-recursion -I '$(COMPRESS_CMD)' -cf $$($(1)_staging_dir)/$$(@F) -T -
+	$(AT)cd $$($(1)_staging_dir)/$(host_prefix); find . | sort | tar --no-recursion --use-compress-program='$(COMPRESS_CMD)' -cf $$($(1)_staging_dir)/$$(@F) -T -
 	$(AT)mkdir -p $$(@D)
 	$(AT)rm -rf $$(@D) && mkdir -p $$(@D)
 	$(AT)mv $$($(1)_staging_dir)/$$(@F) $$(@)