diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index d20b610..05151d9 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -106,12 +106,6 @@ jobs: name: Paarrot-Setup-x64.exe path: dist-electron/squirrel-windows/Paarrot-*-win-x64.exe - - name: Upload Squirrel Setup (arm64) - uses: actions/upload-artifact@v3 - with: - name: Paarrot-Setup-arm64.exe - path: dist-electron/squirrel-windows-arm64/Paarrot-*-win-arm64.exe - - name: List build output shell: powershell run: | @@ -121,41 +115,23 @@ jobs: shell: powershell run: | if (Test-Path "dist-electron/squirrel-windows/RELEASES") { - Copy-Item "dist-electron/squirrel-windows/RELEASES" -Destination "dist-electron/RELEASES-x64" + Copy-Item "dist-electron/squirrel-windows/RELEASES" -Destination "dist-electron/RELEASES" } else { Write-Error "RELEASES file not found for x64" exit 1 } - if (Test-Path "dist-electron/squirrel-windows-arm64/RELEASES") { - Copy-Item "dist-electron/squirrel-windows-arm64/RELEASES" -Destination "dist-electron/RELEASES-arm64" - } else { - Write-Error "RELEASES file not found for arm64" - exit 1 - } - - name: Upload Squirrel RELEASES (x64) + - name: Upload Squirrel RELEASES uses: actions/upload-artifact@v3 with: - name: RELEASES-x64 - path: dist-electron/RELEASES-x64 - - - name: Upload Squirrel RELEASES (arm64) - uses: actions/upload-artifact@v3 - with: - name: RELEASES-arm64 - path: dist-electron/RELEASES-arm64 + name: RELEASES + path: dist-electron/RELEASES - name: Upload Squirrel nupkg (x64) uses: actions/upload-artifact@v3 with: name: Paarrot-x64.nupkg path: dist-electron/squirrel-windows/*.nupkg - - - name: Upload Squirrel nupkg (arm64) - uses: actions/upload-artifact@v3 - with: - name: Paarrot-arm64.nupkg - path: dist-electron/squirrel-windows-arm64/*.nupkg build-linux: runs-on: ubuntu-latest @@ -178,11 +154,6 @@ jobs: with: node-version: '20' - - name: Install system dependencies - run: | - sudo apt-get update - sudo apt-get install -y rpm - - name: Install dependencies (root) run: npm ci --prefer-offline @@ -204,24 +175,6 @@ jobs: with: name: Paarrot-Linux-x64.AppImage path: dist-electron/Paarrot-*.AppImage - - - name: Upload DEB package - uses: actions/upload-artifact@v3 - with: - name: Paarrot-Linux-x64.deb - path: dist-electron/Paarrot-*-linux-amd64.deb - - - name: Upload RPM package - uses: actions/upload-artifact@v3 - with: - name: Paarrot-Linux-x64.rpm - path: dist-electron/Paarrot-*-linux-x86_64.rpm - - - name: Upload Linux update metadata - uses: actions/upload-artifact@v3 - with: - name: latest-linux.yml - path: dist-electron/latest-linux.yml create-release: runs-on: ubuntu-latest @@ -279,7 +232,7 @@ jobs: - name: Prepare release files run: | mkdir -p release-files - find artifacts -type f \( -name "*.exe" -o -name "*.AppImage" -o -name "*.deb" -o -name "*.rpm" -o -name "*.dmg" -o -name "*.zip" -o -name "*.yml" -o -name "*.nupkg" -o -name "RELEASES*" \) -exec cp {} release-files/ \; + find artifacts -type f \( -name "*.exe" -o -name "*.AppImage" -o -name "*.nupkg" -o -name "RELEASES*" \) -exec cp {} release-files/ \; ls -la release-files/ - name: Create or Update Release diff --git a/README.md b/README.md index b32d2ef..d166e48 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ -# Cinny desktop +# Paarrot - - GitHub release downloads - -Cinny is a matrix client focusing primarily on simple, elegant and secure interface. The desktop app is built with Electron. +Paarrot is a Matrix client focusing primarily on simple, elegant and secure interface. The desktop app is built with Electron and based on Cinny. ## Download -Installers for macOS, Windows and Linux can be downloaded from [releases](https://github.com/cinnyapp/cinny-desktop/releases). +Installers for Windows and Linux can be downloaded from [releases](http://synbox.ruv.wtf:8418/litruv/cinny-desktop/releases). Operating System | Download ---|--- -Windows | Get it on Windows -macOS | Get it on macOS -Linux | Get it on Linux +Windows (x64) | Get it on Windows +Linux (AppImage) | Get it on Linux + +### Linux Installation + +For the best AppImage experience, we recommend using [AppImageLauncher](https://github.com/TheAssassin/AppImageLauncher) which automatically integrates AppImages into your system. ## Local development To setup development locally run the following commands: -* `git clone --recursive https://github.com/cinnyapp/cinny-desktop.git` +* `git clone --recursive http://synbox.ruv.wtf:8418/litruv/cinny-desktop.git` * `cd cinny-desktop/cinny` * `npm ci` * `cd ..` diff --git a/electron-builder.json5 b/electron-builder.json5 index e7565cc..d206427 100644 --- a/electron-builder.json5 +++ b/electron-builder.json5 @@ -2,7 +2,7 @@ "appId": "com.paarrot.app", "productName": "Paarrot", "artifactName": "${productName}-${version}-${os}-${arch}.${ext}", - "copyright": "Copyright © 2024", + "copyright": "Copyright © 2026 Mates.Media", "directories": { "output": "dist-electron", "buildResources": "build-resources" @@ -35,18 +35,10 @@ { "target": "AppImage", "arch": ["x64"] - }, - { - "target": "deb", - "arch": ["x64"] - }, - { - "target": "rpm", - "arch": ["x64"] } ], "category": "Network;InstantMessaging", - "maintainer": "Paarrot ", + "maintainer": "Mates.Media ", "icon": "icons/icon.png", "desktop": { "entry": { @@ -81,16 +73,17 @@ "target": [ { "target": "squirrel", - "arch": ["x64", "arm64"] + "arch": ["x64"] } ], "icon": "icons/icon.ico", + "publisherName": "Mates.Media", "artifactName": "${productName}-${version}-${os}-${arch}.${ext}" }, "squirrelWindows": { "name": "Paarrot", "loadingGif": "icons/icon.png", - "iconUrl": "https://raw.githubusercontent.com/cinnyapp/cinny-desktop/master/icons/icon.ico", + "iconUrl": "http://synbox.ruv.wtf:8418/litruv/cinny-desktop/raw/branch/main/icons/icon.ico", "remoteReleases": false, "useAppIdAsId": true }, diff --git a/package.json b/package.json index 080c0a0..e19b3be 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "paarrot", "version": "4.11.23", - "description": "Yet another matrix client", - "homepage": "https://github.com/ajbura/cinny", + "description": "Paarrot - A Matrix client based on Cinny", + "homepage": "http://synbox.ruv.wtf:8418/litruv/cinny-desktop", "main": "electron/main.js", "engines": { "node": ">=18.0.0" @@ -18,8 +18,8 @@ }, "keywords": [], "author": { - "name": "Ajay Bura", - "email": "AjayBura@users.noreply.github.com" + "name": "Mates.Media", + "email": "mates.media@users.noreply.github.com" }, "license": "AGPL-3.0-only", "dependencies": {