From 261d4067af50bcd2a8ff67d730db7a61a26bc00a Mon Sep 17 00:00:00 2001 From: CrystalSplitter Date: Sat, 22 Nov 2025 14:09:09 -0800 Subject: [PATCH 1/3] Add fhs packages for linux packaging We need these libs in the FHS Shell so Nix users can actually build the linux packages needed. --- nix/fhs_shell.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nix/fhs_shell.nix b/nix/fhs_shell.nix index ff132a43..1579c054 100644 --- a/nix/fhs_shell.nix +++ b/nix/fhs_shell.nix @@ -30,6 +30,11 @@ pango udev + libxcrypt-legacy # For 'libcrypt.so.1' for deb packaging + binutils # For ruby deb packaging, needs 'ar' + rpm # For RPM packaging + flatpak-builder # For flatpak building + appimage-run # For appimage running (not building) ]) ++ (with pkgs.xorg; [ From 91d2fcb7486aac13f9f62e6a3e496f5d90a0d032 Mon Sep 17 00:00:00 2001 From: CrystalSplitter Date: Sat, 22 Nov 2025 14:13:37 -0800 Subject: [PATCH 2/3] Add more linux packaging This sets up debian and tarball packaging, adds project maintainers and contact info (please consider them placeholders!), and add new targets for linux packaging. We unfortunately MUST put down an author with an email, so I'm putting myself down. That being said, I'd really like this to change. --- electron-builder.yml | 13 +++++++++---- package.json | 29 ++++++++++++++++++++++++++--- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/electron-builder.yml b/electron-builder.yml index 787a8f31..e7b1b32c 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -7,6 +7,8 @@ files: - "!**/*.js.map" directories: output: "./bin/${platform}/${arch}/" +appImage: + artifactName: "fluentflame-reader-${arch}-${version}.AppImage" mac: darkModeSupport: true target: @@ -36,8 +38,8 @@ win: - zip appx: applicationId: FluentflameReader - identityName: TODO.FluentflameReader - publisher: TODO + identityName: FluentFlame.FluentflameReader + publisher: FluentFlame backgroundColor: transparent languages: - zh-CN @@ -65,11 +67,14 @@ nsis: allowToChangeInstallationDirectory: true deleteAppDataOnUninstall: true linux: + description: "A modern desktop RSS reader given new life" target: - AppImage - - Dir + - deb + - dir + - tar.xz icon: icons - category: Utility + category: Network;Feed desktop: entry: StartupWMClass: fluentflame-reader diff --git a/package.json b/package.json index 8c40afc6..0589e616 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "fluentflame-reader", "version": "1.1.4", - "description": "Modern desktop RSS reader", + "description": "A modern desktop RSS reader given new life", "main": "./dist/electron.js", "scripts": { "build": "webpack --config ./webpack.config.js", @@ -14,10 +14,33 @@ "package-mac": "electron-builder --mac --x64", "package-mas": "bash build/resignAndPackage.sh", "package-linux": "electron-builder --linux --x64 -p never", + "package-tarball": "electron-builder --linux tar.xz --x64 -p never", + "package-appimage": "electron-builder --linux AppImage --x64 -p never", + "package-deb": "electron-builder --linux --x64 -p never", "test": "mocha tests/**/*.ts" }, - "keywords": [], - "author": "Fluentflame contributors & Haoyuan Liu", + "keywords": ["rss", "atom", "rss reader"], + "author": { + "name": "Crystal", + "email": "crystal@crystalwobsite.gay", + "url": "https://crystalwobsite.gay" + }, + "contributors": [ + { + "name": "Crystal", + "email": "crystal@crystalwobsite.gay", + "url": "https://crystalwobsite.gay" + }, + { + "name": "Nube", + "email": "nubesu@tuta.io", + "url": "https://nube.codeberg.page" + }, + { + "name": "Haoyuan Liu", + "email": "hy.liu@berkeley.edu" + } + ], "license": "BSD-3-Clause", "repository": "github:FluentFlame/fluentflame-reader", "devDependencies": { From d7bd46e65c22ca02b63d78a445ac17724df4df18 Mon Sep 17 00:00:00 2001 From: CrystalSplitter Date: Sat, 22 Nov 2025 14:55:30 -0800 Subject: [PATCH 3/3] Update test-linux workflow --- .github/workflows/test-linux.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 129333f3..1d5df506 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -18,7 +18,19 @@ jobs: - run: "npm ci" - run: "npm run build" - run: "npm run test" - - run: "npm run package-linux" + - run: "npm run package-appimage" + ubuntu_package_deb: + runs-on: "ubuntu-latest" + steps: + - uses: "actions/checkout@v5" + - name: "Build Debian Package" + uses: "actions/setup-node@v4" + with: + node-version: "22.x" + cache: "npm" + - run: "npm ci" + - run: "npm run build" + - run: "npm run package-deb" check_nix: runs-on: "ubuntu-latest" steps: