Skip to content

Commit 304eaf1

Browse files
committed
Aha
1 parent 3065e7f commit 304eaf1

File tree

2 files changed

+52
-17
lines changed

2 files changed

+52
-17
lines changed

.github/workflows/linux.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ jobs:
8484
8585
- name: Pack with 7z
8686
run: |
87-
7z a -t7z -mx=5 czkawka_all.7z \
87+
7z a -tzip -mx=3 czkawka_all.zip \
8888
linux_czkawka_cli_${{ env.ARCHNAME }} \
8989
linux_czkawka_gui_${{ env.ARCHNAME }} \
9090
linux_krokiet_${{ env.ARCHNAME }} \
@@ -95,12 +95,13 @@ 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+
9899
- name: Store
99100
uses: actions/upload-artifact@v4
100101
with:
101102
name: all-${{ runner.os }}-${{ runner.arch }}-${{ env.VERS }}
102103
path: |
103-
czkawka_all.7z
104+
czkawka_all.zip
104105
# linux_czkawka_cli_${{ env.ARCHNAME }}
105106
# linux_czkawka_gui_${{ env.ARCHNAME }}
106107
# linux_krokiet_${{ env.ARCHNAME }}

.github/workflows/windows.yml

Lines changed: 49 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@ jobs:
1717
- name: Install dependencies(mostly sd)
1818
run: |
1919
sudo apt update || true;sudo apt install -y mingw-w64 mingw-w64-x86-64-dev
20-
wget https://github.com/chmln/sd/releases/download/v1.0.0/sd-v1.0.0-x86_64-unknown-linux-gnu.tar.gz -O a.tar.gz
21-
tar -xzf a.tar.gz
22-
cp sd-v1.0.0-x86_64-unknown-linux-gnu/sd .
23-
chmod +x ./sd
2420
2521
- name: Setup rust version
2622
run: |
@@ -33,10 +29,6 @@ jobs:
3329
sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
3430
cargo build --release --target x86_64-pc-windows-gnu --bin krokiet
3531
mv target/x86_64-pc-windows-gnu/release/krokiet.exe windows_krokiet_on_linux.exe
36-
cargo build --release --target x86_64-pc-windows-gnu --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
37-
mv target/x86_64-pc-windows-gnu/release/krokiet.exe windows_krokiet_on_linux_skia_opengl.exe
38-
cargo build --release --target x86_64-pc-windows-gnu --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
39-
mv target/x86_64-pc-windows-gnu/release/krokiet.exe windows_krokiet_on_linux_skia_vulkan.exe
4032
4133
- name: Compile Krokiet Debug
4234
if: ${{ github.ref != 'refs/heads/master' }}
@@ -45,19 +37,13 @@ jobs:
4537
sed -i 's|^opt-level = 3 # OPT PACKAGES|#opt-level = 3 # OPT PACKAGES|' Cargo.toml
4638
cargo build --target x86_64-pc-windows-gnu --bin krokiet
4739
mv target/x86_64-pc-windows-gnu/debug/krokiet.exe windows_krokiet_on_linux.exe
48-
cargo build --target x86_64-pc-windows-gnu --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
49-
mv target/x86_64-pc-windows-gnu/debug/krokiet.exe windows_krokiet_on_linux_skia_opengl.exe
50-
cargo build--target x86_64-pc-windows-gnu --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
51-
mv target/x86_64-pc-windows-gnu/debug/krokiet.exe windows_krokiet_on_linux_skia_vulkan.exe
5240
5341
- name: Upload artifacts
5442
uses: actions/upload-artifact@v4
5543
with:
56-
name: krokiet-windows-c-on-linux-${{ github.sha }}
44+
name: krokiet-windows-on-linux-${{ github.sha }}
5745
path: |
5846
./windows_krokiet_on_linux.exe
59-
./windows_krokiet_on_linux_skia_opengl.exe
60-
./windows_krokiet_on_linux_skia_vulkan.exe
6147
if-no-files-found: error
6248

6349
- name: Release
@@ -69,6 +55,54 @@ jobs:
6955
windows_krokiet_on_linux.exe
7056
token: ${{ secrets.PAT_REPOSITORY }}
7157

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 }}
105+
72106
container_4_12:
73107
runs-on: ubuntu-latest
74108
container:

0 commit comments

Comments
 (0)