From 809e06f9c9c4e2fb4eab502f9d2709903954c2eb Mon Sep 17 00:00:00 2001 From: Max Litruv Boonzaayer Date: Fri, 20 Feb 2026 15:18:10 +1100 Subject: [PATCH] fix: update version to 4.10.2 and mark subproject as dirty --- .gitea/workflows/build.yml | 77 +++++++++++++++++++++++++++++--------- cinny | 2 +- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- 5 files changed, 64 insertions(+), 21 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index 7f446bf..7bd6a65 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -111,16 +111,34 @@ jobs: - name: Copy and rename MSI files shell: powershell run: | - # Ensure output dir exists in workspace - New-Item -ItemType Directory -Force -Path "src-tauri/target/release/bundle/msi" | Out-Null - # Copy from persistent cache location - $msi = Get-ChildItem "$env:CARGO_TARGET_DIR/release/bundle/msi/*.msi" -Exclude "Cinny-*" | Select-Object -First 1 - Copy-Item $msi.FullName "src-tauri/target/release/bundle/msi/Cinny-Windows-x64.msi" - $msiZip = Get-ChildItem "$env:CARGO_TARGET_DIR/release/bundle/msi/*.msi.zip" -Exclude "Cinny-*" | Select-Object -First 1 - if ($msiZip) { Copy-Item $msiZip.FullName "src-tauri/target/release/bundle/msi/Cinny-Windows-x64.msi.zip" } - $msiZipSig = Get-ChildItem "$env:CARGO_TARGET_DIR/release/bundle/msi/*.msi.zip.sig" -Exclude "Cinny-*" | Select-Object -First 1 - if ($msiZipSig) { Copy-Item $msiZipSig.FullName "src-tauri/target/release/bundle/msi/Cinny-Windows-x64.msi.zip.sig" } - Get-ChildItem "src-tauri/target/release/bundle/msi/" + # Clean and recreate output dir + $outDir = "src-tauri/target/release/bundle/msi" + if (Test-Path $outDir) { Remove-Item -Recurse -Force $outDir } + New-Item -ItemType Directory -Force -Path $outDir | Out-Null + + # Find and copy MSI from cache location + $srcDir = "$env:CARGO_TARGET_DIR/release/bundle/msi" + Write-Host "Looking for MSI in: $srcDir" + Get-ChildItem $srcDir -ErrorAction SilentlyContinue + + $msi = Get-ChildItem "$srcDir/*.msi" -Exclude "Cinny-*" -ErrorAction Stop | Select-Object -First 1 + Write-Host "Found MSI: $($msi.FullName) (Size: $($msi.Length) bytes)" + Copy-Item $msi.FullName "$outDir/Cinny-Windows-x64.msi" -Force + + $msiZip = Get-ChildItem "$srcDir/*.msi.zip" -Exclude "Cinny-*" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($msiZip) { + Write-Host "Found MSI.zip: $($msiZip.FullName)" + Copy-Item $msiZip.FullName "$outDir/Cinny-Windows-x64.msi.zip" -Force + } + + $msiZipSig = Get-ChildItem "$srcDir/*.msi.zip.sig" -Exclude "Cinny-*" -ErrorAction SilentlyContinue | Select-Object -First 1 + if ($msiZipSig) { + Write-Host "Found MSI.zip.sig: $($msiZipSig.FullName)" + Copy-Item $msiZipSig.FullName "$outDir/Cinny-Windows-x64.msi.zip.sig" -Force + } + + Write-Host "Final output:" + Get-ChildItem $outDir - name: Upload MSI installer uses: actions/upload-artifact@v3 @@ -189,19 +207,44 @@ jobs: - name: Copy and rename Linux packages run: | - # Create workspace output directories + # Clean and recreate workspace output directories + rm -rf src-tauri/target/release/bundle/appimage + rm -rf src-tauri/target/release/bundle/deb + rm -rf src-tauri/target/release/bundle/rpm mkdir -p src-tauri/target/release/bundle/appimage mkdir -p src-tauri/target/release/bundle/deb mkdir -p src-tauri/target/release/bundle/rpm - # Copy from persistent cache location - find $CARGO_TARGET_DIR/release/bundle/appimage -name "*.AppImage" -not -name "Cinny-Linux*" | head -1 | xargs -I {} cp {} src-tauri/target/release/bundle/appimage/Cinny-Linux-x64.AppImage - find $CARGO_TARGET_DIR/release/bundle/deb -name "*.deb" -not -name "Cinny-Linux*" | head -1 | xargs -I {} cp {} src-tauri/target/release/bundle/deb/Cinny-Linux-x64.deb - find $CARGO_TARGET_DIR/release/bundle/rpm -name "*.rpm" -not -name "Cinny-Linux*" | head -1 | xargs -I {} cp {} src-tauri/target/release/bundle/rpm/Cinny-Linux-x64.rpm + + # Show what's available in cache + echo "Available AppImage files:" + ls -la $CARGO_TARGET_DIR/release/bundle/appimage/ || true + echo "Available DEB files:" + ls -la $CARGO_TARGET_DIR/release/bundle/deb/ || true + echo "Available RPM files:" + ls -la $CARGO_TARGET_DIR/release/bundle/rpm/ || true + + # Copy from persistent cache location (excluding already-renamed Cinny-* files) + APPIMAGE=$(find $CARGO_TARGET_DIR/release/bundle/appimage -name "*.AppImage" -not -name "Cinny-Linux*" | head -1) + echo "Copying AppImage: $APPIMAGE" + cp "$APPIMAGE" src-tauri/target/release/bundle/appimage/Cinny-Linux-x64.AppImage + + DEB=$(find $CARGO_TARGET_DIR/release/bundle/deb -name "*.deb" -not -name "Cinny-Linux*" | head -1) + echo "Copying DEB: $DEB" + cp "$DEB" src-tauri/target/release/bundle/deb/Cinny-Linux-x64.deb + + RPM=$(find $CARGO_TARGET_DIR/release/bundle/rpm -name "*.rpm" -not -name "Cinny-Linux*" | head -1) + echo "Copying RPM: $RPM" + cp "$RPM" src-tauri/target/release/bundle/rpm/Cinny-Linux-x64.rpm + # Copy signature file for updater if it exists if ls $CARGO_TARGET_DIR/release/bundle/appimage/*.AppImage.sig 1> /dev/null 2>&1; then - find $CARGO_TARGET_DIR/release/bundle/appimage -name "*.AppImage.sig" -not -name "Cinny-Linux*" | head -1 | xargs -I {} cp {} src-tauri/target/release/bundle/appimage/Cinny-Linux-x64.AppImage.sig + APPSIG=$(find $CARGO_TARGET_DIR/release/bundle/appimage -name "*.AppImage.sig" -not -name "Cinny-Linux*" | head -1) + echo "Copying AppImage sig: $APPSIG" + cp "$APPSIG" src-tauri/target/release/bundle/appimage/Cinny-Linux-x64.AppImage.sig fi - # List what we have + + # List final output + echo "Final output:" ls -la src-tauri/target/release/bundle/appimage/ ls -la src-tauri/target/release/bundle/deb/ ls -la src-tauri/target/release/bundle/rpm/ diff --git a/cinny b/cinny index 29b0d81..d5ca19f 160000 --- a/cinny +++ b/cinny @@ -1 +1 @@ -Subproject commit 29b0d8151b4464c3fe7b56b646785f4b591f7b02 +Subproject commit d5ca19f77043c468408dee3a6cfe2ed2df26c0ed diff --git a/package.json b/package.json index 88a0bce..a47f399 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "paarrot", - "version": "4.10.17", + "version": "4.10.2", "description": "Yet another matrix client", "main": "index.js", "engines": { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index dac4ef7..1f326fb 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -3859,7 +3859,7 @@ dependencies = [ [[package]] name = "paarrot" -version = "4.10.17" +version = "4.10.2" dependencies = [ "arboard", "base64 0.22.1", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 4e057ce..1d507c0 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -2,7 +2,7 @@ [package] name = "paarrot" -version = "4.10.17" +version = "4.10.2" description = "Yet another matrix client" authors = ["Ajay Bura"] license = "AGPL-3.0-only"