Fix: continue to fix release build and CI

This commit is contained in:
2026-01-31 19:58:21 +01:00
parent 793c83e18c
commit 0a4f1419eb
9 changed files with 6 additions and 233 deletions

View File

@@ -70,7 +70,6 @@ jobs:
run: |
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
echo "C:\Program Files\CMake\bin" >> $env:GITHUB_PATH
cargo install cargo-bundle
- name: Build
run: cargo build --release --target ${{ matrix.target }}
@@ -79,6 +78,7 @@ jobs:
run: cargo build --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
- name: Bundle desktop app
if: runner.os != 'Windows'
run: cargo bundle --release --features desktop --bin cagire-desktop --target ${{ matrix.target }}
- name: Upload artifact (Unix)
@@ -109,12 +109,12 @@ jobs:
name: ${{ matrix.artifact }}-desktop
path: target/${{ matrix.target }}/release/bundle/osx/Cagire.app
- name: Upload desktop artifact (Windows MSI)
- name: Upload desktop artifact (Windows exe)
if: runner.os == 'Windows'
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.artifact }}-desktop
path: target/${{ matrix.target }}/release/bundle/msi/*.msi
path: target/${{ matrix.target }}/release/cagire-desktop.exe
release:
needs: build
@@ -137,12 +137,12 @@ jobs:
name=$(basename "$dir")
if [[ "$name" == *-desktop ]]; then
base="${name%-desktop}"
if ls "$dir"/*.msi 1>/dev/null 2>&1; then
cp "$dir"/*.msi "release/${base}-desktop.msi"
elif ls "$dir"/*.deb 1>/dev/null 2>&1; then
if ls "$dir"/*.deb 1>/dev/null 2>&1; then
cp "$dir"/*.deb "release/${base}-desktop.deb"
elif [ -d "$dir/Cagire.app" ]; then
(cd "$dir" && zip -r "../../release/${base}-desktop.app.zip" Cagire.app)
elif [ -f "$dir/cagire-desktop.exe" ]; then
cp "$dir/cagire-desktop.exe" "release/${base}-desktop.exe"
fi
else
if [ -f "$dir/cagire.exe" ]; then