fix: update version to 4.10.2 and mark subproject as dirty
Some checks failed
Build / increment-version (push) Successful in 6s
Build / build-windows (push) Successful in 7m22s
Build / create-release (push) Has been cancelled
Build / build-android (push) Has been cancelled
Build / build-linux (push) Has been cancelled

This commit is contained in:
2026-02-20 15:18:10 +11:00
parent f67a3cd498
commit 809e06f9c9
5 changed files with 64 additions and 21 deletions

View File

@@ -111,16 +111,34 @@ jobs:
- name: Copy and rename MSI files - name: Copy and rename MSI files
shell: powershell shell: powershell
run: | run: |
# Ensure output dir exists in workspace # Clean and recreate output dir
New-Item -ItemType Directory -Force -Path "src-tauri/target/release/bundle/msi" | Out-Null $outDir = "src-tauri/target/release/bundle/msi"
# Copy from persistent cache location if (Test-Path $outDir) { Remove-Item -Recurse -Force $outDir }
$msi = Get-ChildItem "$env:CARGO_TARGET_DIR/release/bundle/msi/*.msi" -Exclude "Cinny-*" | Select-Object -First 1 New-Item -ItemType Directory -Force -Path $outDir | Out-Null
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 # Find and copy MSI from cache location
if ($msiZip) { Copy-Item $msiZip.FullName "src-tauri/target/release/bundle/msi/Cinny-Windows-x64.msi.zip" } $srcDir = "$env:CARGO_TARGET_DIR/release/bundle/msi"
$msiZipSig = Get-ChildItem "$env:CARGO_TARGET_DIR/release/bundle/msi/*.msi.zip.sig" -Exclude "Cinny-*" | Select-Object -First 1 Write-Host "Looking for MSI in: $srcDir"
if ($msiZipSig) { Copy-Item $msiZipSig.FullName "src-tauri/target/release/bundle/msi/Cinny-Windows-x64.msi.zip.sig" } Get-ChildItem $srcDir -ErrorAction SilentlyContinue
Get-ChildItem "src-tauri/target/release/bundle/msi/"
$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 - name: Upload MSI installer
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
@@ -189,19 +207,44 @@ jobs:
- name: Copy and rename Linux packages - name: Copy and rename Linux packages
run: | 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/appimage
mkdir -p src-tauri/target/release/bundle/deb mkdir -p src-tauri/target/release/bundle/deb
mkdir -p src-tauri/target/release/bundle/rpm 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 # Show what's available in cache
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 echo "Available AppImage files:"
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 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 # Copy signature file for updater if it exists
if ls $CARGO_TARGET_DIR/release/bundle/appimage/*.AppImage.sig 1> /dev/null 2>&1; then 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 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/appimage/
ls -la src-tauri/target/release/bundle/deb/ ls -la src-tauri/target/release/bundle/deb/
ls -la src-tauri/target/release/bundle/rpm/ ls -la src-tauri/target/release/bundle/rpm/

2
cinny

Submodule cinny updated: 29b0d8151b...d5ca19f770

View File

@@ -1,6 +1,6 @@
{ {
"name": "paarrot", "name": "paarrot",
"version": "4.10.17", "version": "4.10.2",
"description": "Yet another matrix client", "description": "Yet another matrix client",
"main": "index.js", "main": "index.js",
"engines": { "engines": {

2
src-tauri/Cargo.lock generated
View File

@@ -3859,7 +3859,7 @@ dependencies = [
[[package]] [[package]]
name = "paarrot" name = "paarrot"
version = "4.10.17" version = "4.10.2"
dependencies = [ dependencies = [
"arboard", "arboard",
"base64 0.22.1", "base64 0.22.1",

View File

@@ -2,7 +2,7 @@
[package] [package]
name = "paarrot" name = "paarrot"
version = "4.10.17" version = "4.10.2"
description = "Yet another matrix client" description = "Yet another matrix client"
authors = ["Ajay Bura"] authors = ["Ajay Bura"]
license = "AGPL-3.0-only" license = "AGPL-3.0-only"