🐛 update bugs
This commit is contained in:
2
.github/actions/setup-env/action.yml
vendored
2
.github/actions/setup-env/action.yml
vendored
@@ -108,7 +108,7 @@ 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 libgobject-2.0-dev libgio-3.0-dev libgirepository1.0-dev
|
||||
libglib2.0-dev libgirepository1.0-dev
|
||||
pkg-config
|
||||
version: 1.1
|
||||
|
||||
|
||||
30
Dockerfile
30
Dockerfile
@@ -9,13 +9,17 @@ RUN rustup update stable && rustup default stable
|
||||
RUN rustc --version && cargo --version
|
||||
|
||||
# Install Rust dependencies
|
||||
RUN --mount=type=cache,target=/var/cache/apt \
|
||||
--mount=type=cache,target=/usr/local/cargo/registry \
|
||||
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
||||
rm -f /var/lib/dpkg/lock-frontend /var/lib/dpkg/lock /var/cache/apt/archives/lock && \
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
libdbus-1-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev \
|
||||
libwebkit2gtk-4.1-dev build-essential curl wget libssl-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 gnome-video-effects-extra && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Set PKG_CONFIG_PATH for GLib detection
|
||||
ENV PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
|
||||
|
||||
# Verify Rust version
|
||||
RUN rustc --version && echo "Rust version verified"
|
||||
@@ -40,22 +44,28 @@ FROM rust:latest AS builder
|
||||
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 \
|
||||
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
||||
rm -f /var/lib/dpkg/lock-frontend /var/lib/dpkg/lock /var/cache/apt/archives/lock && \
|
||||
apt-get update && apt-get install -y --no-install-recommends \
|
||||
libdbus-1-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev \
|
||||
libwebkit2gtk-4.1-dev build-essential curl wget libssl-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 gnome-video-effects-extra && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Set PKG_CONFIG_PATH for GLib detection
|
||||
ENV PKG_CONFIG_PATH=/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig
|
||||
|
||||
# Verify Rust version in builder stage
|
||||
RUN rustc --version && echo "Builder stage Rust version verified"
|
||||
|
||||
# Install Node.js 22.x and pnpm
|
||||
RUN --mount=type=cache,target=/var/cache/apt \
|
||||
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
||||
rm -f /var/lib/dpkg/lock-frontend /var/lib/dpkg/lock /var/cache/apt/archives/lock && \
|
||||
curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
|
||||
apt-get update && apt-get install -y nodejs && \
|
||||
npm install -g pnpm
|
||||
npm install -g pnpm && \
|
||||
apt-get clean && rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Copy project files
|
||||
COPY . /pake
|
||||
|
||||
Reference in New Issue
Block a user