TST

Author: qarmin

.github/workflows/windows.yml

@@ -35,7 +35,6 @@ jobs:
           sed -i 's/#codegen-units /codegen-units /g' Cargo.toml
           cargo build --release --target x86_64-pc-windows-gnu --bin krokiet
           mv target/x86_64-pc-windows-gnu/release/krokiet.exe windows_krokiet_on_linux.exe
-          add_icon_exe windows_krokiet_on_linux.exe krokiet/icons/krokiet_logo_flag.ico
 
       - name: Compile Krokiet Debug
         if: ${{ github.ref != 'refs/heads/master' }}
@@ -44,7 +43,11 @@ jobs:
           sed -i 's|^opt-level = 3 # OPT PACKAGES|#opt-level = 3 # OPT PACKAGES|' Cargo.toml
           cargo build --target x86_64-pc-windows-gnu --bin krokiet
           mv target/x86_64-pc-windows-gnu/debug/krokiet.exe windows_krokiet_on_linux.exe
-          add_icon_exe windows_krokiet_on_linux.exe krokiet/icons/krokiet_logo_flag.ico
+
+      - name: Add icon
+        run: |
+          wget -q -O ./rcedit-x64.exe "https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe"
+          wine ./rcedit-x64.exe windows_krokiet_on_linux.exe --set-icon "krokiet/icons/krokiet_logo_flag.ico"
 
       - name: Pack with 7z
         run: |
@@ -92,10 +95,8 @@ jobs:
           powershell -Command "(Get-Content Cargo.toml) -replace '#codegen-units ', 'codegen-units ' | Set-Content Cargo.toml"
           cargo build --release --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
           mv target/release/krokiet.exe windows_krokiet_on_windows_skia_opengl.exe
-          add_icon_exe windows_krokiet_on_windows_skia_opengl.exe krokiet/icons/krokiet_logo_flag.ico
           cargo build --release --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
           mv target/release/krokiet.exe windows_krokiet_on_windows_skia_vulkan.exe
-          add_icon_exe windows_krokiet_on_windows_skia_vulkan.exe krokiet/icons/krokiet_logo_flag.ico
 
       - name: Compile Krokiet Debug
         if: ${{ github.ref != 'refs/heads/master' }}
@@ -106,7 +107,15 @@ jobs:
           powershell -Command "(Get-Content Cargo.toml) -replace '^opt-level = 3 # OPT PACKAGES', '#opt-level = 3 # OPT PACKAGES' | Set-Content Cargo.toml"
           cargo build --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
           mv target/debug/krokiet.exe windows_krokiet_on_windows_skia_opengl.exe
-          add_icon_exe windows_krokiet_on_windows_skia_opengl.exe krokiet/icons/krokiet_logo_flag.ico
+
+      - name: Add icon
+        run: |
+          Invoke-WebRequest -Uri "https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe" -OutFile ".\\rcedit-x64.exe"
+          $rcedit = ".\\rcedit-x64.exe"
+          if (-not (Test-Path $rcedit)) { Write-Error "rcedit not found"; exit 1 }
+          foreach ($f in @("windows_krokiet_on_windows_skia_opengl.exe","windows_krokiet_on_windows_skia_vulkan.exe")) {
+            if (Test-Path $f) { & $rcedit $f --set-icon "krokiet/icons/krokiet_logo_flag.ico" } else { Write-Host "$f not found" }
+          }
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
@@ -156,10 +165,6 @@ jobs:
           cargo build --target=x86_64-pc-windows-gnu --release --locked
           cp target/x86_64-pc-windows-gnu/release/czkawka_gui.exe package/
           cp target/x86_64-pc-windows-gnu/release/czkawka_cli.exe package/
-          
-          add_icon_exe package/czkawka_gui.exe czkawka_gui/icons/icon_about.png
-          add_icon_exe package/czkawka_cli.exe czkawka_gui/icons/icon_about.png
-          
 
       - name: Cross compile for Windows - Debug
         if: ${{ github.ref != 'refs/heads/master' }}
@@ -169,9 +174,17 @@ jobs:
           cargo build --target=x86_64-pc-windows-gnu --locked --profile fastci
           cp target/x86_64-pc-windows-gnu/fastci/czkawka_gui.exe package/
           cp target/x86_64-pc-windows-gnu/fastci/czkawka_cli.exe package/
-          
-          add_icon_exe package/czkawka_gui.exe czkawka_gui/icons/icon_about.png
-          add_icon_exe package/czkawka_cli.exe czkawka_gui/icons/icon_about.png
+
+      - name: Add icon
+        run: |
+          wget -q -O ./rcedit-x64.exe "https://github.com/electron/rcedit/releases/download/v2.0.0/rcedit-x64.exe"
+          for f in package/czkawka_gui.exe package/czkawka_cli.exe; do
+            if [ -f "$f" ]; then
+              wine ./rcedit-x64.exe "$f" --set-icon "czkawka_gui/icons/icon_about.png"
+            else
+              echo "$f not found, skipping"
+            fi
+          done
 
       - name: Package
         run: |