Skip to content

Commit

Permalink
Excluded extensions and krokiet new features (#1184)
Browse files Browse the repository at this point in the history
* AVC

* Import split

* Default thread size

* Hen

* Allowed extensions

* Perf

* Connect

* Excluded

* Zmiany

* Optimization

* 4.10

* At once

* Included

* Chang

* VD

* VD

* Hashes

* Wersja

* SD

* Up

* Up

* 2024

* Dup

* Slint files

* Added  select

* Selections

* Fix

* LTO

* Actions

* Added popup delete

* AB

* V4

* Release

* LTO

* Basic moving

* Commonsy

* Moving probably works

* Popup move
  • Loading branch information
qarmin authored Feb 14, 2024
1 parent b63c631 commit 378fa1f
Show file tree
Hide file tree
Showing 104 changed files with 3,058 additions and 2,491 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/linux_cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,28 @@ jobs:
linux-cli:
strategy:
matrix:
toolchain: [ stable, 1.72.1 ]
toolchain: [ stable, 1.74.0 ]
type: [ release ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install basic libraries
run: sudo apt update || true; sudo apt install libheif-dev ffmpeg -y

- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Enable LTO
run: sed -i 's/#lto = "fat"/lto = "fat"/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@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_cli
Expand Down
10 changes: 7 additions & 3 deletions .github/workflows/linux_cli_eyra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:
type: [ release ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install basic libraries
run: sudo apt update || true; sudo apt install -y ffmpeg

# New versions of nightly rust may call new unimplemented in eyra functions, so use const version
- name: Setup rust version
run: rustup default nightly-2023-12-14
run: rustup default nightly-2024-02-06

- name: Add eyra
run: |
Expand All @@ -32,12 +32,16 @@ jobs:
echo 'fn main() { println!("cargo:rustc-link-arg=-nostartfiles"); }' > build.rs
cd ..
- name: Enable LTO
run: sed -i 's/#lto = "fat"/lto = "fat"/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@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_cli
Expand Down
44 changes: 30 additions & 14 deletions .github/workflows/linux_gui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,25 @@ jobs:
linux-krokiet-gui:
strategy:
matrix:
toolchain: [ stable, 1.72.1 ]
toolchain: [ stable, 1.74.0 ]
type: [ release ]
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Enable LTO
run: sed -i 's/#lto = "fat"/lto = "fat"/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@v3
uses: actions/upload-artifact@v4
with:
name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/krokiet
Expand All @@ -35,24 +39,28 @@ jobs:
linux-krokiet-gui-heif:
strategy:
matrix:
toolchain: [ stable, 1.72.1 ]
toolchain: [ stable, 1.74.0 ]
type: [ release ]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install basic libraries
run: sudo apt update || true; sudo apt install libheif-dev libraw-dev -y

- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Enable LTO
run: sed -i 's/#lto = "fat"/lto = "fat"/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@v3
uses: actions/upload-artifact@v4
with:
name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}-heif-libraw
path: target/release/krokiet
Expand All @@ -61,24 +69,28 @@ jobs:
linux-gui:
strategy:
matrix:
toolchain: [ stable, 1.72.1 ]
toolchain: [ stable, 1.74.0 ]
type: [ release ]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install basic libraries
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 }}

- name: Enable LTO
run: sed -i 's/#lto = "fat"/lto = "fat"/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@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}-heif-libraw
path: target/release/czkawka_gui
Expand All @@ -90,7 +102,7 @@ jobs:

# Only store stable toolchain
- name: Store Linux GUI
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui
Expand All @@ -103,14 +115,18 @@ jobs:
type: [ release ]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- 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

- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Enable LTO
run: sed -i 's/#lto = "fat"/lto = "fat"/g' Cargo.toml
if: ${{ (matrix.type == 'release') }}

- name: Build Release
run: cargo build --release --bin czkawka_gui

Expand All @@ -127,7 +143,7 @@ jobs:
./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
- name: Store Linux Appimage GUI
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_gui-appimage-${{ runner.os }}-${{ matrix.toolchain }}
path: Czkawka*.AppImage
Expand All @@ -144,7 +160,7 @@ jobs:
mv out/Czkawka*.AppImage out/czkawka_gui-minimal.AppImage
- name: Minimal Appimage Upload
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_gui-${{ matrix.toolchain }}_minimal_AppImage
path: out/*.AppImage
Expand All @@ -156,7 +172,7 @@ jobs:
type: [ debug ]
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- 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
Expand Down
18 changes: 11 additions & 7 deletions .github/workflows/mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
type: [ release ]
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Homebrew
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
Expand All @@ -30,26 +30,30 @@ jobs:
- name: Setup rust version
run: rustup default ${{ matrix.toolchain }}

- name: Enable LTO
run: sed -i '' 's/#lto = "fat"/lto = "fat"/g' Cargo.toml
if: ${{ (matrix.type == 'release') }}

- name: Build Release
run: cargo build --release
if: ${{ matrix.type == 'release'}}

- name: Store MacOS CLI
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_cli
if: ${{ matrix.type == 'release' }}

- name: Store MacOS GUI
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/czkawka_gui
if: ${{ matrix.type == 'release' }}

- name: Store MacOS Krokiet
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}
path: target/release/krokiet
Expand All @@ -60,21 +64,21 @@ jobs:
if: ${{ matrix.type == 'release'}}

- name: Store MacOS CLI Heif
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_cli-${{ runner.os }}-${{ matrix.toolchain }}-heif
path: target/release/czkawka_cli
if: ${{ matrix.type == 'release' }}

- name: Store MacOS GUI Heif
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: czkawka_gui-${{ runner.os }}-${{ matrix.toolchain }}-heif
path: target/release/czkawka_gui
if: ${{ matrix.type == 'release' }}

- name: Store MacOS Krokiet Heif
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: krokiet-${{ runner.os }}-${{ matrix.toolchain }}-heif
path: target/release/krokiet
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/quality.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
quality:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Gtk 4
run: sudo apt update || true; sudo apt install -y libgtk-4-dev libraw-dev libheif-dev -y
Expand Down
Loading

0 comments on commit 378fa1f

Please sign in to comment.