Skip to content

Commit 8cd76fd

Browse files
qarminqarmin
committed
Test
1 parent 304eaf1 commit 8cd76fd

File tree

2 files changed

+173
-48
lines changed

2 files changed

+173
-48
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 124 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
8585
- name: Pack with 7z
8686
run: |
87-
7z a -tzip -mx=3 czkawka_all.zip \
87+
time 7z a -tzip -mx=1 czkawka_all.zip \
8888
linux_czkawka_cli_${{ env.ARCHNAME }} \
8989
linux_czkawka_gui_${{ env.ARCHNAME }} \
9090
linux_krokiet_${{ env.ARCHNAME }} \
@@ -95,6 +95,129 @@ jobs:
9595
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
9696
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
9797
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+
168+
time 7z a -t7z -mx=3 czkawka_all.7z \
169+
linux_czkawka_cli_${{ env.ARCHNAME }} \
170+
linux_czkawka_gui_${{ env.ARCHNAME }} \
171+
linux_krokiet_${{ env.ARCHNAME }} \
172+
linux_czkawka_cli_heif_raw_${{ env.ARCHNAME }} \
173+
linux_czkawka_gui_heif_raw_${{ env.ARCHNAME }} \
174+
linux_krokiet_heif_raw_${{ env.ARCHNAME }} \
175+
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
176+
linux_krokiet_heif_raw_skia_opengl_${{ env.ARCHNAME }} \
177+
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
178+
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+
98221
99222
- name: Store
100223
uses: actions/upload-artifact@v4

‎.github/workflows/windows.yml‎

Lines changed: 49 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -55,53 +55,55 @@ jobs:
5555
windows_krokiet_on_linux.exe
5656
token: ${{ secrets.PAT_REPOSITORY }}
5757

58-
krokiet-compiled-on-windows:
59-
runs-on: windows-latest
60-
steps:
61-
- uses: actions/checkout@v4
62-
63-
- name: Setup rust version
64-
run: |
65-
rustup default 1.85.0
66-
rustup target add x86_64-pc-windows-gnu
67-
68-
- name: Compile Krokiet Release
69-
if: ${{ github.ref == 'refs/heads/master' }}
70-
run: |
71-
sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
72-
cargo build --release --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
73-
mv target/release/krokiet.exe windows_krokiet_on_windows_skia_opengl.exe
74-
cargo build --release --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
75-
mv target/release/krokiet.exe windows_krokiet_on_windows_skia_vulkan.exe
76-
77-
- name: Compile Krokiet Debug
78-
if: ${{ github.ref != 'refs/heads/master' }}
79-
run: |
80-
sed -i 's/^\(\[profile\.dev\.package.*\)/#\1/' Cargo.toml
81-
sed -i 's|^opt-level = 3 # OPT PACKAGES|#opt-level = 3 # OPT PACKAGES|' Cargo.toml
82-
cargo build --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
83-
mv target/debug/krokiet.exe windows_krokiet_on_windows_skia_opengl.exe
84-
cargo build --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
85-
mv target/debug/krokiet.exe windows_krokiet_on_windows_skia_vulkan.exe
86-
87-
- name: Upload artifacts
88-
uses: actions/upload-artifact@v4
89-
with:
90-
name: krokiet-windows-on-windows-${{ github.sha }}
91-
path: |
92-
./windows_krokiet_on_windows_skia_opengl.exe
93-
./windows_krokiet_on_windows_skia_vulkan.exe
94-
if-no-files-found: error
95-
96-
- name: Release
97-
uses: softprops/action-gh-release@v2
98-
if: ${{ github.ref == 'refs/heads/master' }}
99-
with:
100-
tag_name: "Nightly"
101-
files: |
102-
windows_krokiet_on_windows_skia_opengl.exe
103-
windows_krokiet_on_windows_skia_vulkan.exe
104-
token: ${{ secrets.PAT_REPOSITORY }}
58+
# Skia not provides support for gnu toolchain, which is easy to cross-compile - https://github.com/rust-skia/rust-skia/issues/345
59+
# So need to compile krokiet on Windows
60+
# TODO - not sure how to replace sed on Windows, this is the only thing that prevents this workflow from working
61+
# krokiet-compiled-on-windows:
62+
# runs-on: windows-latest
63+
# steps:
64+
# - uses: actions/checkout@v4
65+
#
66+
# - name: Setup rust version
67+
# run: |
68+
# rustup default 1.85.0
69+
#
70+
# - name: Compile Krokiet Release
71+
# if: ${{ github.ref == 'refs/heads/master' }}
72+
# run: |
73+
# sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
74+
# cargo build --release --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
75+
# mv target/release/krokiet.exe windows_krokiet_on_windows_skia_opengl.exe
76+
# cargo build --release --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
77+
# mv target/release/krokiet.exe windows_krokiet_on_windows_skia_vulkan.exe
78+
#
79+
# - name: Compile Krokiet Debug
80+
# if: ${{ github.ref != 'refs/heads/master' }}
81+
# run: |
82+
# sed -i 's/^\(\[profile\.dev\.package.*\)/#\1/' Cargo.toml
83+
# sed -i 's|^opt-level = 3 # OPT PACKAGES|#opt-level = 3 # OPT PACKAGES|' Cargo.toml
84+
# cargo build --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
85+
# mv target/debug/krokiet.exe windows_krokiet_on_windows_skia_opengl.exe
86+
# cargo build --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
87+
# mv target/debug/krokiet.exe windows_krokiet_on_windows_skia_vulkan.exe
88+
#
89+
# - name: Upload artifacts
90+
# uses: actions/upload-artifact@v4
91+
# with:
92+
# name: krokiet-windows-on-windows-${{ github.sha }}
93+
# path: |
94+
# ./windows_krokiet_on_windows_skia_opengl.exe
95+
# ./windows_krokiet_on_windows_skia_vulkan.exe
96+
# if-no-files-found: error
97+
#
98+
# - name: Release
99+
# uses: softprops/action-gh-release@v2
100+
# if: ${{ github.ref == 'refs/heads/master' }}
101+
# with:
102+
# tag_name: "Nightly"
103+
# files: |
104+
# windows_krokiet_on_windows_skia_opengl.exe
105+
# windows_krokiet_on_windows_skia_vulkan.exe
106+
# token: ${{ secrets.PAT_REPOSITORY }}
105107

106108
container_4_12:
107109
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)