diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index 73a6e71..414a3cc 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -108,10 +108,16 @@ runs: libdbus-1-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra - libglib2.0-dev libglib2.0-dev-bin libgio2.0-cil-dev libgirepository1.0-dev + libglib2.0-dev libgobject-2.0-dev libgio-3.0-dev libgirepository1.0-dev pkg-config version: 1.1 + - name: Set PKG_CONFIG_PATH for Linux + if: env.SETUP_SYSTEM == 'true' && runner.os == 'Linux' + shell: bash + run: | + echo "PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig" >> $GITHUB_ENV + - name: Install WIX Toolset if: env.SETUP_SYSTEM == 'true' && runner.os == 'Windows' shell: powershell diff --git a/Dockerfile b/Dockerfile index d0f5c6a..9fb4213 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,13 @@ # syntax=docker/dockerfile:1.4 -# Cargo build stage - Updated to Rust 1.85 for edition2024 support -FROM rust:1.85-slim AS cargo-builder +# Cargo build stage - Updated to latest Rust for edition2024 support +FROM rust:latest AS cargo-builder + +# Update Rust to ensure we have the latest version with edition2024 support +RUN rustup update stable && rustup default stable + +# Verify Rust version supports edition2024 +RUN rustc --version && cargo --version + # Install Rust dependencies RUN --mount=type=cache,target=/var/cache/apt \ --mount=type=cache,target=/usr/local/cargo/registry \ @@ -27,7 +34,11 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ RUN ls -la /cargo-cache/registry && ls -la /cargo-cache/git && rm -rfd /cargo-cache/registry/src # Main build stage -FROM rust:1.85-slim AS builder +FROM rust:latest AS builder + +# Update Rust to ensure we have the latest version with edition2024 support +RUN rustup update stable && rustup default stable + # Install Rust dependencies RUN --mount=type=cache,target=/var/cache/apt \ --mount=type=cache,target=/usr/local/cargo/registry \ diff --git a/dist/cli.js b/dist/cli.js index 42fbb08..167a93d 100755 --- a/dist/cli.js +++ b/dist/cli.js @@ -22,7 +22,7 @@ import sharp from 'sharp'; import * as psl from 'psl'; var name = "pake-cli"; -var version = "3.3.3"; +var version = "3.3.4"; var description = "๐Ÿคฑ๐Ÿป Turn any webpage into a desktop app with one command. ๐Ÿคฑ๐Ÿป ไธ€้”ฎๆ‰“ๅŒ…็ฝ‘้กต็”Ÿๆˆ่ฝป้‡ๆกŒ้ขๅบ”็”จใ€‚"; var engines = { node: ">=18.0.0" diff --git a/package.json b/package.json index 3ecfbd2..9912350 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pake-cli", - "version": "3.3.3", + "version": "3.3.4", "description": "๐Ÿคฑ๐Ÿป Turn any webpage into a desktop app with one command. ๐Ÿคฑ๐Ÿป ไธ€้”ฎๆ‰“ๅŒ…็ฝ‘้กต็”Ÿๆˆ่ฝป้‡ๆกŒ้ขๅบ”็”จใ€‚", "engines": { "node": ">=18.0.0"