mirror of
https://github.com/kunkunsh/kunkun-ext-neohtop.git
synced 2025-04-11 17:29:45 +00:00
Merge branch 'main' into fix-regex-exception
This commit is contained in:
commit
0eee4dffe5
55
.github/workflows/build-check.yml
vendored
55
.github/workflows/build-check.yml
vendored
@ -6,6 +6,12 @@ on:
|
|||||||
|
|
||||||
env:
|
env:
|
||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
|
CARGO_INCREMENTAL: 1
|
||||||
|
CARGO_NET_RETRY: 10
|
||||||
|
RUSTUP_MAX_RETRIES: 10
|
||||||
|
RUST_BACKTRACE: 1
|
||||||
|
RUSTC_WRAPPER: sccache
|
||||||
|
CARGO_BUILD_JOBS: 2
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@ -21,13 +27,25 @@ jobs:
|
|||||||
node-version: 'lts/*'
|
node-version: 'lts/*'
|
||||||
cache: 'npm'
|
cache: 'npm'
|
||||||
|
|
||||||
- name: Install Rust
|
- name: Cache Linux Dependencies
|
||||||
uses: dtolnay/rust-toolchain@stable
|
id: cache-apt
|
||||||
|
uses: actions/cache@v3
|
||||||
|
with:
|
||||||
|
path: |
|
||||||
|
/var/cache/apt/archives/*.deb
|
||||||
|
/var/lib/apt/lists/*
|
||||||
|
key: ${{ runner.os }}-apt-${{ hashFiles('**/build-check.yml') }}
|
||||||
|
restore-keys: |
|
||||||
|
${{ runner.os }}-apt-
|
||||||
|
|
||||||
- name: Install Linux Dependencies
|
- name: Install Linux Dependencies
|
||||||
run: |
|
run: |
|
||||||
|
sudo rm -rf /var/cache/apt/archives/lock
|
||||||
|
sudo rm -rf /var/cache/apt/archives/partial
|
||||||
|
sudo rm -rf /var/lib/apt/lists/lock
|
||||||
|
sudo rm -rf /var/lib/apt/lists/partial
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y \
|
sudo apt-get install --no-install-recommends -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
pkg-config \
|
pkg-config \
|
||||||
libgtk-3-dev \
|
libgtk-3-dev \
|
||||||
@ -37,12 +55,31 @@ jobs:
|
|||||||
libjavascriptcoregtk-4.0-dev \
|
libjavascriptcoregtk-4.0-dev \
|
||||||
libsoup-3.0-dev \
|
libsoup-3.0-dev \
|
||||||
libwebkit2gtk-4.1-dev
|
libwebkit2gtk-4.1-dev
|
||||||
|
|
||||||
|
- name: Install Rust
|
||||||
|
uses: dtolnay/rust-toolchain@stable
|
||||||
|
with:
|
||||||
|
components: cargo
|
||||||
|
target: x86_64-unknown-linux-gnu
|
||||||
|
|
||||||
|
- name: Install sccache
|
||||||
|
run: |
|
||||||
|
SCCACHE_VERSION=v0.7.7
|
||||||
|
curl -L "https://github.com/mozilla/sccache/releases/download/${SCCACHE_VERSION}/sccache-${SCCACHE_VERSION}-x86_64-unknown-linux-musl.tar.gz" | tar xz
|
||||||
|
sudo mv sccache-*/sccache /usr/local/bin/sccache
|
||||||
|
echo "RUSTC_WRAPPER=sccache" >> $GITHUB_ENV
|
||||||
|
|
||||||
|
- uses: Swatinem/rust-cache@v2
|
||||||
|
with:
|
||||||
|
workspaces: "./src-tauri -> target"
|
||||||
|
shared-key: "build"
|
||||||
|
|
||||||
- name: Install Dependencies
|
- name: Install Dependencies
|
||||||
run: npm install
|
run: npm ci
|
||||||
|
|
||||||
- name: Build Frontend
|
|
||||||
run: npm run build
|
|
||||||
|
|
||||||
- name: Build Application
|
- name: Build Application
|
||||||
run: npm run tauri build
|
run: |
|
||||||
|
npm run tauri build -- \
|
||||||
|
--target x86_64-unknown-linux-gnu \
|
||||||
|
--bundles deb \
|
||||||
|
--ci
|
@ -39,8 +39,8 @@
|
|||||||
"resizable": true,
|
"resizable": true,
|
||||||
"title": "NeoHtop",
|
"title": "NeoHtop",
|
||||||
"width": 1280,
|
"width": 1280,
|
||||||
"minWidth": 1280,
|
"minWidth": 1120,
|
||||||
"minHeight": 900
|
"minHeight": 700
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
|
|
||||||
let columns: Column[] = [
|
let columns: Column[] = [
|
||||||
{ id: "name", label: "Process Name", visible: true, required: true },
|
{ id: "name", label: "Process Name", visible: true, required: true },
|
||||||
{ id: "pid", label: "PID", visible: true, required: true },
|
{ id: "pid", label: "PID", visible: true, required: false },
|
||||||
{
|
{
|
||||||
id: "status",
|
id: "status",
|
||||||
label: "Status",
|
label: "Status",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user