Merge branch 'master' into master

renner0e · Oct 10, 2024 · 0ed95a3 · 0ed95a3
2 parents 8aa8c1f + d11bde4
commit 0ed95a3
Show file tree

Hide file tree

Showing 166 changed files with 6,735 additions and 3,457 deletions.
diff --git a/.github/workflows/linux_cli.yml b/.github/workflows/linux_cli.yml
@@ -10,34 +10,30 @@ env:
 
 jobs:
   linux-cli:
-    strategy:
-      matrix:
-        toolchain: [ stable, 1.75.0 ]
-        type: [ release ]
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
 
       - name: Install basic libraries
-        run: sudo apt update || true; sudo apt install libheif-dev ffmpeg -y
+        run: sudo apt update || true; sudo apt install libheif-dev libraw-dev ffmpeg -y
 
       - name: Setup rust version
-        run: rustup default ${{ matrix.toolchain }}
+        run: rustup default stable
 
       - name: Enable LTO
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Build Release
         run: cargo build --release --bin czkawka_cli
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Store Linux CLI
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}
+          name: czkawka_cli-${{ runner.os }}
           path: target/release/czkawka_cli
-        if: ${{ matrix.type == 'release' }}
+
+      - name: Build test version
+        run: cargo build --profile test --bin czkawka_cli
 
       - name: Linux Regression Test
         run: |
@@ -46,5 +42,16 @@ jobs:
           cargo build --release
           cd ..
           
-          ci_tester/target/release/ci_tester target/release/czkawka_cli
-        if: ${{ matrix.type == 'release' }}
+          ci_tester/target/release/ci_tester target/debug/czkawka_cli
+
+      - name: Prepare files to release
+        run: |
+          mv target/release/czkawka_cli linux_czkawka_cli
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            linux_czkawka_cli
+          token: ${{ secrets.PAT_REPOSITORY }}
diff --git a/.github/workflows/linux_cli_eyra.yml b/.github/workflows/linux_cli_eyra.yml
@@ -10,10 +10,6 @@ env:
 
 jobs:
   linux-cli:
-    strategy:
-      matrix:
-        toolchain: [ nightly ]
-        type: [ release ]
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
@@ -23,7 +19,7 @@ jobs:
 
       # New versions of nightly rust may call new unimplemented in eyra functions, so use const version
       - name: Setup rust version
-        run: rustup default nightly-2024-02-06
+        run: rustup default nightly-2024-09-25
 
       - name: Add eyra
         run: |
@@ -34,18 +30,15 @@ jobs:
 
       - name: Enable LTO
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Build Release
         run: cargo build --release --bin czkawka_cli
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Store Linux CLI
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}
+          name: czkawka_cli-${{ runner.os }}
           path: target/release/czkawka_cli
-        if: ${{ matrix.type == 'release' }}
 
       - name: Linux Regression Test
         run: |
@@ -55,4 +48,15 @@ jobs:
           cd ..
           
           ci_tester/target/release/ci_tester target/release/czkawka_cli
-        if: ${{ matrix.type == 'release' }}
+
+      - name: Prepare files to release
+        run: |
+          mv target/release/czkawka_cli linux_czkawka_cli_eyra
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            linux_czkawka_cli_eyra
+          token: ${{ secrets.PAT_REPOSITORY }}
diff --git a/.github/workflows/linux_gui.yml b/.github/workflows/linux_gui.yml
@@ -10,37 +10,38 @@ env:
 
 jobs:
   linux-krokiet-gui:
-    strategy:
-      matrix:
-        toolchain: [ stable, 1.75.0 ]
-        type: [ release ]
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v4
 
       - name: Setup rust version
-        run: rustup default ${{ matrix.toolchain }}
+        run: rustup default stable
 
       - name: Enable LTO
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Build Release Krokiet
         run: cargo build --release --bin krokiet
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Store Linux GUI Krokiet
         uses: actions/upload-artifact@v4
         with:
-          name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}
+          name: krokiet-${{ runner.os }}
           path: target/release/krokiet
-        if: ${{ matrix.type == 'release' }}
+
+      - name: Prepare files to release
+        run: |
+          mv target/release/krokiet linux_krokiet_gui
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            linux_krokiet_gui
+          token: ${{ secrets.PAT_REPOSITORY }}
 
   linux-krokiet-gui-heif:
-    strategy:
-      matrix:
-        toolchain: [ stable, 1.75.0 ]
-        type: [ release ]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -49,28 +50,33 @@ jobs:
         run: sudo apt update || true; sudo apt install libheif-dev libraw-dev -y
 
       - name: Setup rust version
-        run: rustup default ${{ matrix.toolchain }}
+        run: rustup default stable
 
       - name: Enable LTO
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Build Release Krokiet heif
         run: cargo build --release --bin krokiet --features "heif,libraw"
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Store Linux GUI Krokiet heif libraw
         uses: actions/upload-artifact@v4
         with:
-          name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}-heif-libraw
+          name: krokiet-${{ runner.os }}-heif-libraw
           path: target/release/krokiet
-        if: ${{ matrix.type == 'release' }}
+
+      - name: Prepare files to release
+        run: |
+          mv target/release/krokiet linux_krokiet_heif_raw_gui
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            linux_krokiet_heif_raw_gui
+          token: ${{ secrets.PAT_REPOSITORY }}
 
   linux-gui:
-    strategy:
-      matrix:
-        toolchain: [ stable, 1.75.0 ]
-        type: [ release ]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
@@ -79,53 +85,55 @@ jobs:
         run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev libraw-dev -y
 
       - name: Setup rust version
-        run: rustup default ${{ matrix.toolchain }}
+        run: rustup default stable
 
       - name: Enable LTO
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Build Release Heif Libraw
         run: cargo build --release --bin czkawka_gui --features "heif,libraw"
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Store Linux GUI Heif Libraw
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}-heif-libraw
+          name: czkawka_gui-${{ runner.os }}-heif-libraw
           path: target/release/czkawka_gui
-        if: ${{ (matrix.type == 'release') && (matrix.toolchain == 'stable') }}
 
       - name: Build Release
         run: cargo build --release --bin czkawka_gui
-        if: ${{ (matrix.type == 'release') }}
 
       # Only store stable toolchain
       - name: Store Linux GUI
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}
+          name: czkawka_gui-${{ runner.os }}
           path: target/release/czkawka_gui
-        if: ${{ (matrix.type == 'release') && (matrix.toolchain == 'stable') }}
+
+      - name: Prepare files to release
+        run: |
+          mv target/release/czkawka_gui linux_czkawka_gui
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            linux_czkawka_gui
+          token: ${{ secrets.PAT_REPOSITORY }}
 
   linux-appimage-gui:
-    strategy:
-      matrix:
-        toolchain: [ stable ]
-        type: [ release ]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
       - name: Install Dependencies
-        run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev librsvg2-dev wget fuse libfuse2 -y
+        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 ${{ matrix.toolchain }}
+        run: rustup default stable
 
       - name: Enable LTO
         run: sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
-        if: ${{ (matrix.type == 'release') }}
 
       - name: Build Release
         run: cargo build --release --bin czkawka_gui
@@ -135,19 +143,30 @@ jobs:
           pwd
           wget -c "https://raw.githubusercontent.com/linuxdeploy/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh"
           wget -c "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+          wget -c "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           chmod +x linuxdeploy-plugin-gtk.sh
           chmod +x linuxdeploy-x86_64.AppImage
+          chmod +x appimagetool-x86_64.AppImage
           mkdir -p AppDir/usr/bin
           pwd
           cp target/release/czkawka_gui AppDir/usr/bin
-          ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin gtk --output appimage --icon-file data/icons/com.github.qarmin.czkawka.svg --desktop-file data/com.github.qarmin.czkawka.desktop
+          ./linuxdeploy-x86_64.AppImage --appdir AppDir --plugin gtk --icon-file data/icons/com.github.qarmin.czkawka.svg --desktop-file data/com.github.qarmin.czkawka.desktop
+          ./appimagetool-x86_64.AppImage --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 20 \
+            -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|czkawka|latest|*.AppImage.zsync" \
+            ./AppDir
 
       - name: Store Linux Appimage GUI
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_gui-appimage-${{ runner.os }}-${{ matrix.toolchain }}
+          name: czkawka_gui-appimage-${{ runner.os }}
           path: Czkawka*.AppImage
 
+      - name: Store Linux Appimage GUI Zsync
+        uses: actions/upload-artifact@v4
+        with:
+          name: czkawka_gui-appimage-${{ runner.os }}.zsync
+          path: Czkawka*.AppImage.zsync
+
       - name: Minimal AppImage
         run: |
           pwd
@@ -162,23 +181,31 @@ jobs:
       - name: Minimal Appimage Upload
         uses: actions/upload-artifact@v4
         with:
-          name: czkawka_gui-${{ matrix.toolchain }}_minimal_AppImage
+          name: czkawka_gui_minimal_AppImage
           path: out/*.AppImage
 
+      - name: Prepare files to release
+        run: |
+          mv out/czkawka_gui-minimal.AppImage linux_czkawka_gui_minimal.AppImage
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: ${{ github.ref == 'refs/heads/master' }}
+        with:
+          tag_name: "Nightly"
+          files: |
+            linux_czkawka_gui_minimal.AppImage
+          token: ${{ secrets.PAT_REPOSITORY }}
+
   linux-tests:
-    strategy:
-      matrix:
-        toolchain: [ stable ]
-        type: [ debug ]
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
 
       - name: Install Dependencies
-        run: sudo apt update || true; sudo apt install libgtk-4-dev libheif-dev librsvg2-dev wget fuse libfuse2 -y xvfb
+        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 ${{ matrix.toolchain }}
+        run: rustup default stable
 
       - name: Test
         run: xvfb-run cargo test