Merge branch 'master' into file-debug

qarmin · Feb 26, 2025 · dd4451c · dd4451c
2 parents 7ffc75b + 8a0d415
commit dd4451c
Show file tree

Hide file tree

Showing 79 changed files with 1,203 additions and 723 deletions.
diff --git a/.github/workflows/linux_cli.yml b/.github/workflows/linux_cli.yml
@@ -18,9 +18,10 @@ jobs:
         run: sudo apt update || true; sudo apt install libheif-dev libraw-dev ffmpeg -y
 
       - name: Setup rust version
-        run: rustup default stable
+        run: rustup default 1.85.0
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Build Release with fast_image_resize

diff --git a/.github/workflows/linux_cli_eyra.yml b/.github/workflows/linux_cli_eyra.yml
@@ -29,6 +29,7 @@ jobs:
           cd ..
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Build Release

diff --git a/.github/workflows/linux_gui.yml b/.github/workflows/linux_gui.yml
@@ -15,9 +15,10 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup rust version
-        run: rustup default stable
+        run: rustup default 1.85.0
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Build Release Krokiet
@@ -50,9 +51,10 @@ jobs:
         run: sudo apt update || true; sudo apt install libheif-dev libraw-dev -y
 
       - name: Setup rust version
-        run: rustup default stable
+        run: rustup default 1.85.0
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Build Release Krokiet heif
@@ -85,9 +87,10 @@ jobs:
         run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev -y
 
       - name: Setup rust version
-        run: rustup default stable
+        run: rustup default 1.85.0
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Build Release Heif Libraw
@@ -130,9 +133,10 @@ jobs:
         run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev librsvg2-dev wget fuse libfuse2 desktop-file-utils -y
 
       - name: Setup rust version
-        run: rustup default stable
+        run: rustup default 1.85.0
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Build Release
@@ -173,7 +177,9 @@ jobs:
           rm -rf czkawka_gui
           cp target/release/czkawka_gui .
           strip czkawka_gui
-          wget https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage--x86_64.AppImage -O pkg2.appimage
+          wget https://github.com/qarmin/Automated-Fuzzer/releases/download/test/pkg2appimage-1eceb30-x86_64.AppImage -O pkg2.appimage
+          # TODO - official link from below, no longer works and there is no official releases except continuous versions which have no stable version numbering
+          # wget https://github.com/AppImageCommunity/pkg2appimage/releases/download/continuous/pkg2appimage--x86_64.AppImage -O pkg2.appimage
           chmod +x ./pkg2.appimage
           ./pkg2.appimage misc/czkawka-appimage-recipe.yml
           mv out/Czkawka*.AppImage out/czkawka_gui-minimal.AppImage
@@ -205,7 +211,7 @@ jobs:
         run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev librsvg2-dev wget fuse libfuse2 -y xvfb
 
       - name: Setup rust version
-        run: rustup default stable
+        run: rustup default 1.85.0
 
       - name: Test
         run: xvfb-run cargo test
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
@@ -9,8 +9,8 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  macos:
-    runs-on: macos-latest
+  macos_x86_64:
+    runs-on: macos-13
     steps:
       - uses: actions/checkout@v4
 
@@ -24,9 +24,10 @@ jobs:
           brew link --overwrite [email protected]
 
       - name: Setup rust version
-        run: rustup default stable
+        run: rustup default 1.85.0
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i '' 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Build Release
@@ -35,55 +36,133 @@ jobs:
       - name: Store MacOS CLI
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_cli-${{ runner.os }}
+          name: czkawka_cli-${{ runner.os }}-x86_64
           path: target/release/czkawka_cli
 
       - name: Store MacOS GUI
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_gui-${{ runner.os }}
+          name: czkawka_gui-${{ runner.os }}-x86_64
           path: target/release/czkawka_gui
 
       - name: Store MacOS Krokiet
         uses: actions/upload-artifact@v4
         with:
-          name: krokiet-${{ runner.os }}
+          name: krokiet-${{ runner.os }}-x86_64
           path: target/release/krokiet
 
       - name: Prepare files to release
         run: |
-          mv target/release/czkawka_cli macos_czkawka_cli
-          mv target/release/czkawka_gui macos_czkawka_gui
-          mv target/release/krokiet macos_krokiet
+          mv target/release/czkawka_cli macos_czkawka_cli_x86_64
+          mv target/release/czkawka_gui macos_czkawka_gui_x86_64
+          mv target/release/krokiet macos_krokiet_x86_64
+
       - name: Release
         uses: softprops/action-gh-release@v2
         if: ${{ github.ref == 'refs/heads/master' }}
         with:
           tag_name: "Nightly"
           files: |
-            macos_czkawka_cli
-            macos_czkawka_gui
-            macos_krokiet
+            macos_czkawka_cli_x86_64
+            macos_czkawka_gui_x86_64
+            macos_krokiet_x86_64
+          token: ${{ secrets.PAT_REPOSITORY }}
+
+      # TODO - compilation is broken, not sure why, if you want to use it you need to fix it(I'm too lazy and don't have MacOS)
+      - name: Build Release Heif
+        run: cargo build --release --features heif
+
+      - name: Store MacOS CLI Heif
+        uses: actions/upload-artifact@v4
+        with:
+          name: czkawka_cli-${{ runner.os }}-heif-x86_64
+          path: target/release/czkawka_cli
+
+      - name: Store MacOS GUI Heif
+        uses: actions/upload-artifact@v4
+        with:
+          name: czkawka_gui-${{ runner.os }}-heif-x86_64
+          path: target/release/czkawka_gui
+
+      - name: Store MacOS Krokiet Heif
+        uses: actions/upload-artifact@v4
+        with:
+          name: krokiet-${{ runner.os }}-heif-x86_64
+          path: target/release/krokiet
+
+      - name: Prepare files to release 2
+        run: |
+          mv target/release/czkawka_cli macos_czkawka_cli_heif_x86_64
+          mv target/release/czkawka_gui macos_czkawka_gui_heif_x86_64
+          mv target/release/krokiet macos_krokiet_heif_x86_64
+
+      - name: Release 2
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            macos_czkawka_cli_heif_x86_64
+            macos_czkawka_gui_heif_x86_64
+            macos_krokiet_heif_x86_64
           token: ${{ secrets.PAT_REPOSITORY }}
 
-#      # TODO - compilation is broken, not sure why
-#      - name: Build Release Heif
-#        run: cargo build --release --features heif
-#
-#      - name: Store MacOS CLI Heif
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: czkawka_cli-${{ runner.os }}-heif
-#          path: target/release/czkawka_cli
-#
-#      - name: Store MacOS GUI Heif
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: czkawka_gui-${{ runner.os }}-heif
-#          path: target/release/czkawka_gui
-#
-#      - name: Store MacOS Krokiet Heif
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: krokiet-${{ runner.os }}-heif
-#          path: target/release/krokiet
+  macos_arm:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install Homebrew
+        run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
+      - name: Install GTK4
+        run: |
+          brew link --overwrite [email protected]
+          brew install rust gtk4 libheif || true
+          brew link --overwrite [email protected]
+
+      - name: Setup rust version
+        run: rustup default 1.85.0
+
+      - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
+        run: sed -i '' 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
+
+      - name: Build Release
+        run: cargo build --release
+
+      - name: Store MacOS CLI
+        uses: actions/upload-artifact@v4
+        with:
+          name: czkawka_cli-${{ runner.os }}-arm
+          path: target/release/czkawka_cli
+
+      - name: Store MacOS GUI
+        uses: actions/upload-artifact@v4
+        with:
+          name: czkawka_gui-${{ runner.os }}-arm
+          path: target/release/czkawka_gui
+
+      - name: Store MacOS Krokiet
+        uses: actions/upload-artifact@v4
+        with:
+          name: krokiet-${{ runner.os }}-arm
+          path: target/release/krokiet
+
+      - name: Prepare files to release
+        run: |
+          mv target/release/czkawka_cli macos_czkawka_cli_arm
+          mv target/release/czkawka_gui macos_czkawka_gui_arm
+          mv target/release/krokiet macos_krokiet_arm
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            macos_czkawka_cli_arm
+            macos_czkawka_gui_arm
+            macos_krokiet_arm
+          token: ${{ secrets.PAT_REPOSITORY }}
+      # TODO - arm builds not works now with heif
diff --git a/.github/workflows/minimial_version.yml b/.github/workflows/minimial_version.yml
@@ -18,7 +18,7 @@ jobs:
         run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev ffmpeg -y
 
       - name: Setup rust version
-        run: rustup default 1.82.0
+        run: rustup default 1.85.0
 
       - name: Build
         run: |

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -17,6 +17,12 @@ jobs:
       - name: Install Gtk 4
         run: sudo apt update || true; sudo apt install -y libgtk-4-dev libraw-dev libheif-dev libavif-dev libdav1d-dev -y
 
+      - name: Setup rust version
+        run: |
+          rustup default 1.85.0
+          rustup component add rustfmt
+          rustup component add clippy
+
       - name: Check the format
         run: cargo fmt --all -- --check
 

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -24,9 +24,11 @@ jobs:
 
       - name: Setup rust version
         run: |
+          rustup default 1.85.0
           rustup target add x86_64-pc-windows-gnu
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Compile Krokiet
@@ -86,9 +88,10 @@ jobs:
           cp a/sd-v1.0.0-x86_64-pc-windows-gnu/sd.exe .
 
       - name: Setup rust version
-        run: rustup default stable-x86_64-pc-windows-gnu
+        run: rustup default 1.85.0-x86_64-pc-windows-gnu
 
       - name: Enable LTO
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
 
       - name: Compile Krokiet
@@ -148,6 +151,7 @@ jobs:
           dnf install curl wget2 unzip mingw64-bzip2.noarch mingw64-poppler mingw64-poppler-glib mingw32-python3 rust-gio-devel adwaita-icon-theme -y && dnf clean all -y
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           source "$HOME/.cargo/env"
+          rustup default 1.85.0
           rustup target add x86_64-pc-windows-gnu
 
       - name: Cross compile for Windows
@@ -215,6 +219,7 @@ jobs:
           dnf install curl wget2 unzip mingw64-bzip2.noarch mingw64-poppler mingw64-poppler-glib mingw32-python3 rust-gio-devel adwaita-icon-theme -y && dnf clean all -y
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           source "$HOME/.cargo/env"
+          rustup default 1.85.0
           rustup target add x86_64-pc-windows-gnu
 
       - name: Cross compile for Windows
@@ -290,6 +295,7 @@ jobs:
           dnf install curl wget2 unzip mingw64-bzip2.noarch mingw64-poppler mingw64-poppler-glib mingw32-python3 rust-gio-devel adwaita-icon-theme -y && dnf clean all -y
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
           source "$HOME/.cargo/env"
+          rustup default 1.85.0
           rustup target add x86_64-pc-windows-gnu
 
       - name: Show console window on windows