diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml index 5e96c33..0ef31e4 100644 --- a/.github/workflows/build-check.yml +++ b/.github/workflows/build-check.yml @@ -6,6 +6,12 @@ on: env: 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: build: @@ -21,13 +27,25 @@ jobs: node-version: 'lts/*' cache: 'npm' - - name: Install Rust - uses: dtolnay/rust-toolchain@stable - + - name: Cache Linux Dependencies + 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 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 install -y \ + sudo apt-get install --no-install-recommends -y \ build-essential \ pkg-config \ libgtk-3-dev \ @@ -37,12 +55,31 @@ jobs: libjavascriptcoregtk-4.0-dev \ libsoup-3.0-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 - run: npm install - - - name: Build Frontend - run: npm run build + 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/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 6a8242c..accfa57 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -30,7 +30,7 @@ let columns: Column[] = [ { 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", label: "Status",