diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml index 1cf1952..0ef31e4 100644 --- a/.github/workflows/build-check.yml +++ b/.github/workflows/build-check.yml @@ -78,4 +78,8 @@ jobs: run: npm ci - name: Build Application - run: npm run tauri build \ No newline at end of file + run: | + npm run tauri build -- \ + --target x86_64-unknown-linux-gnu \ + --bundles deb \ + --ci \ No newline at end of file diff --git a/.github/workflows/linux-aarch64-nightly.yml b/.github/workflows/linux-aarch64-nightly.yml index 36cda9d..caf1df9 100644 --- a/.github/workflows/linux-aarch64-nightly.yml +++ b/.github/workflows/linux-aarch64-nightly.yml @@ -135,6 +135,15 @@ jobs: for f in *.deb; do echo "AARCH64_DEB_PATH=src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/$f" >> $GITHUB_ENV done + + - name: Build RPM Package + run: | + echo "Building RPM package for aarch64..." + npm run tauri build -- --target aarch64-unknown-linux-gnu --bundles rpm + cd src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/rpm/ + for f in *.rpm; do + echo "AARCH64_RPM_PATH=src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/rpm/$f" >> $GITHUB_ENV + done - name: Get version from package.json id: version @@ -160,4 +169,15 @@ jobs: upload_url: ${{ github.event.inputs.release_upload_url }} asset_path: ${{ env.AARCH64_DEB_PATH }} asset_name: NeoHtop_${{ steps.version.outputs.version }}_aarch64.deb - asset_content_type: application/vnd.debian.binary-package \ No newline at end of file + asset_content_type: application/vnd.debian.binary-package + + - name: Upload RPM Package to Release + if: github.event.inputs.release_upload_url != '' + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} + with: + upload_url: ${{ github.event.inputs.release_upload_url }} + asset_path: ${{ env.AARCH64_RPM_PATH }} + asset_name: NeoHtop_${{ steps.version.outputs.version }}_aarch64.rpm + asset_content_type: application/x-rpm \ No newline at end of file diff --git a/.github/workflows/linux-x86_64-nightly.yml b/.github/workflows/linux-x86_64-nightly.yml index 7544804..aec76d3 100644 --- a/.github/workflows/linux-x86_64-nightly.yml +++ b/.github/workflows/linux-x86_64-nightly.yml @@ -66,6 +66,15 @@ jobs: echo "DEB_PATH=src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/$f" >> $GITHUB_ENV done + - name: Build RPM Package (x86_64) + run: | + echo "Building RPM package for x86_64..." + npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles rpm + cd src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/rpm/ + for f in *.rpm; do + echo "RPM_PATH=src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/rpm/$f" >> $GITHUB_ENV + done + - name: Get version from package.json id: version run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT @@ -90,4 +99,15 @@ jobs: upload_url: ${{ github.event.inputs.release_upload_url }} asset_path: ${{ env.DEB_PATH }} asset_name: NeoHtop_${{ steps.version.outputs.version }}_x86_64.deb - asset_content_type: application/vnd.debian.binary-package \ No newline at end of file + asset_content_type: application/vnd.debian.binary-package + + - name: Upload RPM Package to Release + if: github.event.inputs.release_upload_url != '' + uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} + with: + upload_url: ${{ github.event.inputs.release_upload_url }} + asset_path: ${{ env.RPM_PATH }} + asset_name: NeoHtop_${{ steps.version.outputs.version }}_x86_64.rpm + asset_content_type: application/x-rpm diff --git a/README.md b/README.md index 051a6a8..c9341a2 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Search for processes by name, command, or PID. Search for multiple things at once by separating them with commas. For example, `arm, x86` will return processes having `arm` or `x86` as a substring of the name or command. You can use regular expressions too. For example, `d$` will return a list of daemons (which tend to end in the letter `d`), while - `(\w+)\.\w+` will return a list of processes with reverse domain name notation, such as `com.docker.vmnetd`. + `^(\w+\.)+\w+$` will return a list of processes with reverse domain name notation, such as `com.docker.vmnetd`. - 📌 Pin important processes - 🛠 Process management (kill processes) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c8cb640..e753646 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -39,8 +39,8 @@ "resizable": true, "title": "NeoHtop", "width": 1280, - "minWidth": 1280, - "minHeight": 900 + "minWidth": 1120, + "minHeight": 700 } ], "security": { diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index e99026b..accfa57 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -68,7 +68,13 @@ const nameSubstringMatch = process.name .toLowerCase() .includes(term.toLowerCase()); - const nameRegexMatch = new RegExp(term, "i").test(process.name); + const nameRegexMatch = (() => { + try { + return new RegExp(term, "i").test(process.name); + } catch { + return false; + } + })(); const commandMatch = process.command .toLowerCase() .includes(term.toLowerCase());