Skip to content

Commit 539da48

Browse files
qarminqarmin
committed
Ehh
1 parent 8cd76fd commit 539da48

File tree

3 files changed

+21
-146
lines changed

3 files changed

+21
-146
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 4 additions & 134 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,9 @@ jobs:
8484
8585
- name: Pack with 7z
8686
run: |
87-
time 7z a -tzip -mx=1 czkawka_all.zip \
88-
linux_czkawka_cli_${{ env.ARCHNAME }} \
89-
linux_czkawka_gui_${{ env.ARCHNAME }} \
90-
linux_krokiet_${{ env.ARCHNAME }} \
91-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
92-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
93-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
94-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
95-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
96-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
97-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
98-
ls -alh czkawka_all.zip
99-
100-
time 7z a -tzip -mx=3 czkawka_all.zip \
101-
linux_czkawka_cli_${{ env.ARCHNAME }} \
102-
linux_czkawka_gui_${{ env.ARCHNAME }} \
103-
linux_krokiet_${{ env.ARCHNAME }} \
104-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
105-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
106-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
107-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
108-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
109-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
110-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
111-
ls -alh czkawka_all.zip
112-
113-
time 7z a -tzip -mx=5 czkawka_all.zip \
114-
linux_czkawka_cli_${{ env.ARCHNAME }} \
115-
linux_czkawka_gui_${{ env.ARCHNAME }} \
116-
linux_krokiet_${{ env.ARCHNAME }} \
117-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
118-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
119-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
120-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
121-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
122-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
123-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
124-
ls -alh czkawka_all.zip
125-
126-
time 7z a -tzip -mx=7 czkawka_all.zip \
127-
linux_czkawka_cli_${{ env.ARCHNAME }} \
128-
linux_czkawka_gui_${{ env.ARCHNAME }} \
129-
linux_krokiet_${{ env.ARCHNAME }} \
130-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
131-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
132-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
133-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
134-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
135-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
136-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
137-
ls -alh czkawka_all.zip
138-
139-
time 7z a -tzip -mx=9 czkawka_all.zip \
140-
linux_czkawka_cli_${{ env.ARCHNAME }} \
141-
linux_czkawka_gui_${{ env.ARCHNAME }} \
142-
linux_krokiet_${{ env.ARCHNAME }} \
143-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
144-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
145-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
146-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
147-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
148-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
149-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
150-
ls -alh czkawka_all.zip
151-
152-
153-
154-
155-
time 7z a -t7z -mx=1 czkawka_all.7z \
156-
linux_czkawka_cli_${{ env.ARCHNAME }} \
157-
linux_czkawka_gui_${{ env.ARCHNAME }} \
158-
linux_krokiet_${{ env.ARCHNAME }} \
159-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
160-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
161-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
162-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
163-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
164-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
165-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
166-
ls -alh czkawka_all.7z
167-
87+
# 7z -mx=3 in rust files, takes 40% less space but is 2x slower than zip -mx=1
88+
# 7z -mx=3 is 8x faster than 7z -mx=5, but generates 20% bigger
89+
# So looks that -mx=3 is the best option
16890
time 7z a -t7z -mx=3 czkawka_all.7z \
16991
linux_czkawka_cli_${{ env.ARCHNAME }} \
17092
linux_czkawka_gui_${{ env.ARCHNAME }} \
@@ -176,65 +98,13 @@ jobs:
17698
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
17799
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
178100
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
179-
ls -alh czkawka_all.7z
180-
181-
time 7z a -t7z -mx=5 czkawka_all.7z \
182-
linux_czkawka_cli_${{ env.ARCHNAME }} \
183-
linux_czkawka_gui_${{ env.ARCHNAME }} \
184-
linux_krokiet_${{ env.ARCHNAME }} \
185-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
186-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
187-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
188-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
189-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
190-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
191-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
192-
ls -alh czkawka_all.7z
193-
194-
time 7z a -t7z -mx=7 czkawka_all.7z \
195-
linux_czkawka_cli_${{ env.ARCHNAME }} \
196-
linux_czkawka_gui_${{ env.ARCHNAME }} \
197-
linux_krokiet_${{ env.ARCHNAME }} \
198-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
199-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
200-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
201-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
202-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
203-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
204-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
205-
ls -alh czkawka_all.7z
206-
207-
time 7z a -t7z -mx=9 czkawka_all.7z \
208-
linux_czkawka_cli_${{ env.ARCHNAME }} \
209-
linux_czkawka_gui_${{ env.ARCHNAME }} \
210-
linux_krokiet_${{ env.ARCHNAME }} \
211-
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
212-
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
213-
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
214-
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
215-
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
216-
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
217-
linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
218-
ls -alh czkawka_all.7z
219-
220-
221101
222102
- name: Store
223103
uses: actions/upload-artifact@v4
224104
with:
225105
name: all-${{ runner.os }}-${{ runner.arch }}-${{ env.VERS }}
226106
path: |
227-
czkawka_all.zip
228-
# linux_czkawka_cli_${{ env.ARCHNAME }}
229-
# linux_czkawka_gui_${{ env.ARCHNAME }}
230-
# linux_krokiet_${{ env.ARCHNAME }}
231-
# linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }}
232-
# linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }}
233-
# linux_krokiet_heif_raw_${{ env.ARCHNAME }}
234-
# linux_krokiet_skia_opengl_${{ env.ARCHNAME }}
235-
# linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }}
236-
# linux_krokiet_skia_vulkan_${{ env.ARCHNAME }}
237-
# linux_krokiet_heif_raw_skia_vulkan_${{ env.ARCHNAME }}
107+
czkawka_all.7z
238108
239109
- name: Release
240110
if: ${{ github.ref == 'refs/heads/master' }}

‎.github/workflows/windows.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616

17-
- name: Install dependencies(mostly sd)
17+
- name: Install dependencies
1818
run: |
1919
sudo apt update || true;sudo apt install -y mingw-w64 mingw-w64-x86-64-dev
2020
@@ -38,12 +38,17 @@ jobs:
3838
cargo build --target x86_64-pc-windows-gnu --bin krokiet
3939
mv target/x86_64-pc-windows-gnu/debug/krokiet.exe windows_krokiet_on_linux.exe
4040
41+
- name: Pack with 7z
42+
run: |
43+
time 7z a -t7z -mx=3 czkawka_all.7z \
44+
windows_krokiet_on_linux.exe
45+
4146
- name: Upload artifacts
4247
uses: actions/upload-artifact@v4
4348
with:
4449
name: krokiet-windows-on-linux-${{ github.sha }}
4550
path: |
46-
./windows_krokiet_on_linux.exe
51+
czkawka_all.7z
4752
if-no-files-found: error
4853

4954
- name: Release
@@ -91,8 +96,8 @@ jobs:
9196
# with:
9297
# name: krokiet-windows-on-windows-${{ github.sha }}
9398
# path: |
94-
# ./windows_krokiet_on_windows_skia_opengl.exe
95-
# ./windows_krokiet_on_windows_skia_vulkan.exe
99+
# windows_krokiet_on_windows_skia_opengl.exe
100+
# windows_krokiet_on_windows_skia_vulkan.exe
96101
# if-no-files-found: error
97102
#
98103
# - name: Release

‎Changelog.md‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,21 @@
4747
- Improved appearance of bottom directories panel - [#1569](https://github.com/qarmin/czkawka/pull/1569)
4848

4949
### External
50-
- There is a new unofficial Tauri-based frontend for Czkawka(inspired by Krokiet ui) - [Czkawka Tauri](https://github.com/shixinhuang99/czkawka-tauri)
50+
- There is a new unofficial Tauri-based frontend for Czkawka - [Czkawka Tauri](https://github.com/shixinhuang99/czkawka-tauri)
5151
- Czkawka 8.0.0 is now available in Debian Sid - [Cli](https://packages.debian.org/sid/czkawka-cli)/[Gui Gtk](https://packages.debian.org/sid/czkawka-gui)
5252

5353
### CI
54-
- Compilation for 32-bit targets is now checked in CI.
55-
- Czkawka binaries are now checked for reproducibility in CI.
54+
- Compilation for 32-bit targets is now checked in CI
55+
- Czkawka binaries are now checked for reproducibility in CI
5656

5757

5858
### Prebuilt binaries
59-
- AppImage binaries are no longer provided due to random bugs (not present in other packaging formats) and minimal added value compared to prebuilt Linux binaries or Flatpak.\
60-
- HEIF Mac binaries are now provided.
61-
- CI now builds Linux binaries on Ubuntu 22.04 instead of 20.04(github removed 20.04 images).
59+
- AppImage binaries are no longer provided due to random bugs (not present in other packaging formats) and minimal added value compared to prebuilt Linux binaries or Flatpak
60+
- HEIF Mac binaries are now provided
61+
- CI now builds Linux binaries on Ubuntu 22.04 instead of 20.04(github removed 20.04 images)
6262
- `musl` builds of `czkawka_cli` are now provided instead of `eyra` builds (slightly easier to maintain). GUI builds are not included due to limitations of `musl` and `eyra` :(
63-
- Prebuilt Windows console binaries are no longer provided — logs are now saved to a file, which is easier to read than terminal output.
64-
- Skia opengl and vulkan backends are provided for Krokiet on Linux
63+
- Prebuilt Windows console binaries are no longer provided — logs are now saved to a file, which is easier to read than terminal output
64+
- Skia opengl and vulkan backends are provided for Krokiet on Linux(no binaries on Windows, because don't know how to replace `sed`)
6565

6666
## Version 9.0.0 - 16.03.2025r
6767

0 commit comments

Comments
 (0)