Skip to content

Commit 6d36cce

Browse files
qarminqarmin
committed
Month
1 parent 2520e2b commit 6d36cce

3 files changed

Lines changed: 70 additions & 16 deletions

File tree

‎.github/workflows/linux.yml‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,19 @@ jobs:
7474
cargo build --bin krokiet --no-default-features --features "winit_femtovg,winit_skia_opengl,winit_skia_vulkan,winit_software,femtovg_wgpu" --profile fastci
7575
mv target/fastci/krokiet linux_krokiet_all_backends_${{ env.ARCHNAME }}
7676
77+
- name: Package krokiet with launchers
78+
run: |
79+
mkdir krokiet_package
80+
cp linux_krokiet_all_backends_${{ env.ARCHNAME }} krokiet_package/krokiet
81+
chmod +x krokiet_package/krokiet
82+
printf '#!/bin/sh\nSLINT_BACKEND=winit-femtovg exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_femtovg.sh
83+
printf '#!/bin/sh\nSLINT_BACKEND=winit-skia-opengl exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_skia_opengl.sh
84+
printf '#!/bin/sh\nSLINT_BACKEND=winit-skia-vulkan exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_skia_vulkan.sh
85+
printf '#!/bin/sh\nSLINT_BACKEND=winit-software exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_software.sh
86+
printf '#!/bin/sh\nSLINT_BACKEND=femtovg-wgpu exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_femtovg_wgpu.sh
87+
chmod +x krokiet_package/*.sh
88+
cd krokiet_package && zip -r ../linux_krokiet_all_backends_${{ env.ARCHNAME }}.zip . && cd ..
89+
7790
- name: Pack with 7z
7891
run: |
7992
# 7z -mx=3 in rust files, takes 40% less space but is 2x slower than zip -mx=1
@@ -86,7 +99,8 @@ jobs:
8699
linux_krokiet_skia_opengl_${{ env.ARCHNAME }} \
87100
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }} \
88101
linux_krokiet_femtovg_wgpu_${{ env.ARCHNAME }} \
89-
linux_krokiet_all_backends_${{ env.ARCHNAME }}
102+
linux_krokiet_all_backends_${{ env.ARCHNAME }} \
103+
linux_krokiet_all_backends_${{ env.ARCHNAME }}.zip
90104
91105
- name: Store
92106
uses: actions/upload-artifact@v6
@@ -107,7 +121,7 @@ jobs:
107121
linux_krokiet_skia_opengl_${{ env.ARCHNAME }}
108122
linux_krokiet_skia_vulkan_${{ env.ARCHNAME }}
109123
linux_krokiet_femtovg_wgpu_${{ env.ARCHNAME }}
110-
linux_krokiet_all_backends_${{ env.ARCHNAME }}
124+
linux_krokiet_all_backends_${{ env.ARCHNAME }}.zip
111125
token: ${{ secrets.PAT_REPOSITORY }}
112126

113127
# Some dependencies requires ubuntu 24.04
@@ -189,6 +203,23 @@ jobs:
189203
linux_krokiet_heif_raw_avif_femtovg_wgpu_${{ env.ARCHNAME }} \
190204
linux_krokiet_heif_raw_avif_all_backends_${{ env.ARCHNAME }}
191205
206+
- name: Package krokiet (heif+avif) with launchers
207+
run: |
208+
mkdir krokiet_package_heif
209+
cp linux_krokiet_heif_raw_avif_all_backends_${{ env.ARCHNAME }} krokiet_package_heif/krokiet
210+
chmod +x krokiet_package_heif/krokiet
211+
printf '#!/bin/sh\nSLINT_BACKEND=winit-femtovg exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package_heif/krokiet_winit_femtovg.sh
212+
printf '#!/bin/sh\nSLINT_BACKEND=winit-skia-opengl exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package_heif/krokiet_winit_skia_opengl.sh
213+
printf '#!/bin/sh\nSLINT_BACKEND=winit-skia-vulkan exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package_heif/krokiet_winit_skia_vulkan.sh
214+
printf '#!/bin/sh\nSLINT_BACKEND=winit-software exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package_heif/krokiet_winit_software.sh
215+
printf '#!/bin/sh\nSLINT_BACKEND=femtovg-wgpu exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package_heif/krokiet_femtovg_wgpu.sh
216+
chmod +x krokiet_package_heif/*.sh
217+
cd krokiet_package_heif && zip -r ../linux_krokiet_heif_raw_avif_all_backends_${{ env.ARCHNAME }}.zip . && cd ..
218+
219+
- name: Add krokiet zip to 7z archive
220+
run: |
221+
7z a -t7z -mx=3 czkawka_all.7z linux_krokiet_heif_raw_avif_all_backends_${{ env.ARCHNAME }}.zip
222+
192223
- name: Store
193224
uses: actions/upload-artifact@v6
194225
with:
@@ -208,7 +239,7 @@ jobs:
208239
linux_krokiet_heif_raw_avif_skia_opengl_${{ env.ARCHNAME }}
209240
linux_krokiet_heif_raw_avif_skia_vulkan_${{ env.ARCHNAME }}
210241
linux_krokiet_heif_raw_avif_femtovg_wgpu_${{ env.ARCHNAME }}
211-
linux_krokiet_heif_raw_avif_all_backends_${{ env.ARCHNAME }}
242+
linux_krokiet_heif_raw_avif_all_backends_${{ env.ARCHNAME }}.zip
212243
token: ${{ secrets.PAT_REPOSITORY }}
213244

214245
### MUSL CLI and Krokiet Release and Debug

‎.github/workflows/mac.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
os: [macos-latest, macos-15-intel]
18+
os: [macos-latest]
1919
steps:
2020
- uses: actions/checkout@v6
2121

@@ -102,11 +102,25 @@ jobs:
102102
cargo build --profile fastci --bin krokiet --no-default-features --features "winit_femtovg,winit_skia_opengl,winit_skia_vulkan,winit_software,femtovg_wgpu,heif,libavif"
103103
mv target/fastci/krokiet mac_krokiet_heif_avif_all_backends_${{ env.ARCHNAME }}
104104
105+
- name: Package krokiet with launchers
106+
run: |
107+
mkdir krokiet_package
108+
cp mac_krokiet_all_backends_${{ env.ARCHNAME }} krokiet_package/krokiet
109+
chmod +x krokiet_package/krokiet
110+
printf '#!/bin/sh\nSLINT_BACKEND=winit-femtovg exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_femtovg.sh
111+
printf '#!/bin/sh\nSLINT_BACKEND=winit-skia-opengl exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_skia_opengl.sh
112+
printf '#!/bin/sh\nSLINT_BACKEND=winit-skia-vulkan exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_skia_vulkan.sh
113+
printf '#!/bin/sh\nSLINT_BACKEND=winit-software exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_winit_software.sh
114+
printf '#!/bin/sh\nSLINT_BACKEND=femtovg-wgpu exec "$(dirname "$0")/krokiet" "$@"\n' > krokiet_package/krokiet_femtovg_wgpu.sh
115+
chmod +x krokiet_package/*.sh
116+
cd krokiet_package && zip -r ../mac_krokiet_all_backends_${{ env.ARCHNAME }}.zip . && cd ..
117+
105118
- name: Store MacOS
106119
uses: actions/upload-artifact@v6
107120
with:
108121
name: all-${{ runner.os }}-${{ runner.arch }}-${{ env.VERS }}
109122
path: |
123+
mac_krokiet_all_backends_${{ env.ARCHNAME }}.zip
110124
mac_czkawka_cli_heif_avif_${{ env.ARCHNAME }}
111125
mac_czkawka_gui_heif_avif_${{ env.ARCHNAME }}
112126
mac_krokiet_heif_avif_${{ env.ARCHNAME }}
@@ -118,14 +132,14 @@ jobs:
118132
mac_krokiet_skia_vulkan_heif_avif_${{ env.ARCHNAME }}
119133
mac_krokiet_skia_vulkan_${{ env.ARCHNAME }}
120134
mac_krokiet_femtovg_wgpu_${{ env.ARCHNAME }}
121-
mac_krokiet_all_backends_${{ env.ARCHNAME }}
122135
123136
- name: Release
124137
if: ${{ github.ref == 'refs/heads/master' && vars.HAVE_PAT_REPOSITORY_TOKEN == '1' }}
125138
uses: softprops/action-gh-release@v2
126139
with:
127140
tag_name: "Nightly"
128141
files: |
142+
mac_krokiet_all_backends_${{ env.ARCHNAME }}.zip
129143
mac_czkawka_cli_heif_avif_${{ env.ARCHNAME }}
130144
mac_czkawka_gui_heif_avif_${{ env.ARCHNAME }}
131145
mac_krokiet_heif_avif_${{ env.ARCHNAME }}
@@ -137,5 +151,4 @@ jobs:
137151
mac_krokiet_skia_vulkan_heif_avif_${{ env.ARCHNAME }}
138152
mac_krokiet_skia_vulkan_${{ env.ARCHNAME }}
139153
mac_krokiet_femtovg_wgpu_${{ env.ARCHNAME }}
140-
mac_krokiet_all_backends_${{ env.ARCHNAME }}
141154
token: ${{ secrets.PAT_REPOSITORY }}

‎.github/workflows/windows.yml‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,32 @@ jobs:
118118
119119
Get-ChildItem windows_krokiet_on_windows_*.exe | ForEach-Object { ./rcedit-x64.exe $_.Name --set-icon krokiet/icons/krokiet_logo_flag.ico }
120120
121+
- name: Package krokiet with launchers
122+
run: |
123+
New-Item -ItemType Directory -Force krokiet_package | Out-Null
124+
Copy-Item windows_krokiet_on_windows_all_backends.exe krokiet_package\krokiet.exe
125+
$scripts = [ordered]@{
126+
"krokiet_winit_femtovg.bat" = "winit-femtovg"
127+
"krokiet_winit_skia_opengl.bat" = "winit-skia-opengl"
128+
"krokiet_winit_skia_vulkan.bat" = "winit-skia-vulkan"
129+
"krokiet_winit_software.bat" = "winit-software"
130+
"krokiet_femtovg_wgpu.bat" = "femtovg-wgpu"
131+
}
132+
foreach ($file in $scripts.Keys) {
133+
$backend = $scripts[$file]
134+
"@echo off`r`nset SLINT_BACKEND=$backend`r`n`"%~dp0krokiet.exe`" %*`r`n" | Set-Content -Encoding ASCII "krokiet_package\$file"
135+
}
136+
Compress-Archive -Path krokiet_package\* -DestinationPath windows_krokiet_on_windows_all_backends.zip
137+
121138
- name: Upload artifacts
122139
uses: actions/upload-artifact@v6
123140
with:
124141
name: krokiet-windows-on-windows-${{ github.sha }}
125142
path: |
143+
windows_krokiet_on_windows_all_backends.zip
126144
windows_krokiet_on_windows_skia_opengl.exe
127145
windows_krokiet_on_windows_skia_vulkan.exe
128146
windows_krokiet_on_windows_femtovg_wgpu.exe
129-
windows_krokiet_on_windows_all_backends.exe
130147
if-no-files-found: error
131148

132149
- name: Release
@@ -135,10 +152,10 @@ jobs:
135152
with:
136153
tag_name: "Nightly"
137154
files: |
155+
windows_krokiet_on_windows_all_backends.zip
138156
windows_krokiet_on_windows_skia_opengl.exe
139157
windows_krokiet_on_windows_skia_vulkan.exe
140158
windows_krokiet_on_windows_femtovg_wgpu.exe
141-
windows_krokiet_on_windows_all_backends.exe
142159
token: ${{ secrets.PAT_REPOSITORY }}
143160

144161
container_4_12:
@@ -217,14 +234,7 @@ jobs:
217234
mv libEGL.dll package/
218235
mv libGLESv2.dll package/
219236
220-
cp windows_krokiet_on_windows_all_backends.exe package/krokiet.exe
221-
222-
# krokiet SLINT_BACKEND launcher scripts
223-
printf '@echo off\r\nset SLINT_BACKEND=winit-femtovg\r\n"%%~dp0krokiet.exe" %%*\r\n' > package/krokiet_winit_femtovg.bat
224-
printf '@echo off\r\nset SLINT_BACKEND=winit-skia-opengl\r\n"%%~dp0krokiet.exe" %%*\r\n' > package/krokiet_winit_skia_opengl.bat
225-
printf '@echo off\r\nset SLINT_BACKEND=winit-skia-vulkan\r\n"%%~dp0krokiet.exe" %%*\r\n' > package/krokiet_winit_skia_vulkan.bat
226-
printf '@echo off\r\nset SLINT_BACKEND=winit-software\r\n"%%~dp0krokiet.exe" %%*\r\n' > package/krokiet_winit_software.bat
227-
printf '@echo off\r\nset SLINT_BACKEND=femtovg-wgpu\r\n"%%~dp0krokiet.exe" %%*\r\n' > package/krokiet_femtovg_wgpu.bat
237+
unzip windows_krokiet_on_windows_all_backends.zip -d package/
228238
229239
{
230240
echo '# Czkawka'

0 commit comments

Comments
 (0)