diff --git a/.github/workflows/packaging-lint.yml b/.github/workflows/packaging-lint.yml index 41b361cb..2b53ae6c 100644 --- a/.github/workflows/packaging-lint.yml +++ b/.github/workflows/packaging-lint.yml @@ -47,6 +47,10 @@ jobs: - name: XML, desktop entry, AppStream, Flatpak manifest run: | xmllint --noout packaging/windows/lightcraft.wxs packaging/macos/*.plist* packaging/linux/*.xml* + # Windows Installer needs Icon ids ending in .ico or .exe, or shortcuts show a blank icon. + if grep -oE '"$RUNNER_TEMP/ai.storyteller.lightcraft.metainfo.xml" appstreamcli validate --no-net --explain "$RUNNER_TEMP/ai.storyteller.lightcraft.metainfo.xml" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b04f35f..8b3bdea3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -221,8 +221,9 @@ jobs: - name: Install wasm-bindgen CLI run: | # Must match the wasm-bindgen version in Cargo.lock exactly (cargo xtask web checks it). - command -v wasm-bindgen >/dev/null && wasm-bindgen --version | grep -q "$WASM_BINDGEN_VERSION" \ - || cargo install wasm-bindgen-cli --version "$WASM_BINDGEN_VERSION" --locked + if ! { command -v wasm-bindgen >/dev/null && wasm-bindgen --version | grep -q "$WASM_BINDGEN_VERSION"; }; then + cargo install wasm-bindgen-cli --version "$WASM_BINDGEN_VERSION" --locked + fi wasm-bindgen --version - name: Apply version override if: inputs.version != '' diff --git a/packaging/windows/lightcraft.wxs b/packaging/windows/lightcraft.wxs index 9d41899d..37510455 100644 --- a/packaging/windows/lightcraft.wxs +++ b/packaging/windows/lightcraft.wxs @@ -17,15 +17,15 @@ Scope="perMachine" Compressed="yes" Language="1033"> - + - - + + @@ -45,8 +45,8 @@ + Description="LightCraft photo library and raw developer" WorkingDirectory="INSTALLFOLDER" Advertise="yes" + Icon="LightcraftIcon.ico" IconIndex="0" />