🐛 Fix release dependency version
This commit is contained in:
8
.github/actions/setup-env/action.yml
vendored
8
.github/actions/setup-env/action.yml
vendored
@@ -91,12 +91,13 @@ runs:
|
|||||||
uses: dtolnay/rust-toolchain@stable
|
uses: dtolnay/rust-toolchain@stable
|
||||||
with:
|
with:
|
||||||
toolchain: stable
|
toolchain: stable
|
||||||
target: x86_64-apple-darwin
|
|
||||||
|
|
||||||
- name: Add macOS universal targets
|
- name: Add macOS universal targets
|
||||||
if: env.SETUP_RUST == 'true' && runner.os == 'macOS'
|
if: env.SETUP_RUST == 'true' && runner.os == 'macOS'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: rustup target add aarch64-apple-darwin
|
run: |
|
||||||
|
rustup target add x86_64-apple-darwin
|
||||||
|
rustup target add aarch64-apple-darwin
|
||||||
|
|
||||||
# 4. System Dependencies
|
# 4. System Dependencies
|
||||||
- name: Install Ubuntu dependencies
|
- name: Install Ubuntu dependencies
|
||||||
@@ -107,7 +108,8 @@ runs:
|
|||||||
libdbus-1-dev libsoup-3.0-dev libjavascriptcoregtk-4.1-dev libwebkit2gtk-4.1-dev
|
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
|
build-essential curl wget file libxdo-dev libssl-dev libgtk-3-dev
|
||||||
libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
|
libayatana-appindicator3-dev librsvg2-dev gnome-video-effects gnome-video-effects-extra
|
||||||
libglib2.0-dev pkg-config
|
libglib2.0-dev libglib2.0-dev-bin libgio2.0-cil-dev libgirepository1.0-dev
|
||||||
|
pkg-config
|
||||||
version: 1.1
|
version: 1.1
|
||||||
|
|
||||||
- name: Install WIX Toolset
|
- name: Install WIX Toolset
|
||||||
|
|||||||
2
.github/workflows/single-app.yaml
vendored
2
.github/workflows/single-app.yaml
vendored
@@ -76,7 +76,7 @@ jobs:
|
|||||||
- name: Setup Node.js Environment
|
- name: Setup Node.js Environment
|
||||||
uses: ./.github/actions/setup-env
|
uses: ./.github/actions/setup-env
|
||||||
with:
|
with:
|
||||||
mode: node-only
|
mode: ${{ matrix.build == 'linux' && 'full' || 'node-only' }}
|
||||||
|
|
||||||
- name: Rust cache restore
|
- name: Rust cache restore
|
||||||
uses: actions/cache/restore@v4.2.0
|
uses: actions/cache/restore@v4.2.0
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# syntax=docker/dockerfile:1.4
|
# syntax=docker/dockerfile:1.4
|
||||||
# Cargo build stage - Updated to Rust 1.82 for zerovec dependency compatibility
|
# Cargo build stage - Updated to Rust 1.85 for edition2024 support
|
||||||
FROM rust:1.82-slim AS cargo-builder
|
FROM rust:1.85-slim AS cargo-builder
|
||||||
# Install Rust dependencies
|
# Install Rust dependencies
|
||||||
RUN --mount=type=cache,target=/var/cache/apt \
|
RUN --mount=type=cache,target=/var/cache/apt \
|
||||||
--mount=type=cache,target=/usr/local/cargo/registry \
|
--mount=type=cache,target=/usr/local/cargo/registry \
|
||||||
@@ -27,7 +27,7 @@ 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
|
RUN ls -la /cargo-cache/registry && ls -la /cargo-cache/git && rm -rfd /cargo-cache/registry/src
|
||||||
|
|
||||||
# Main build stage
|
# Main build stage
|
||||||
FROM rust:1.82-slim AS builder
|
FROM rust:1.85-slim AS builder
|
||||||
# Install Rust dependencies
|
# Install Rust dependencies
|
||||||
RUN --mount=type=cache,target=/var/cache/apt \
|
RUN --mount=type=cache,target=/var/cache/apt \
|
||||||
--mount=type=cache,target=/usr/local/cargo/registry \
|
--mount=type=cache,target=/usr/local/cargo/registry \
|
||||||
|
|||||||
2
dist/cli.js
vendored
2
dist/cli.js
vendored
@@ -1674,7 +1674,7 @@ program
|
|||||||
if (option.flags === '-v, --version')
|
if (option.flags === '-v, --version')
|
||||||
return '';
|
return '';
|
||||||
return option.description;
|
return option.description;
|
||||||
}
|
},
|
||||||
})
|
})
|
||||||
.action(async (url, options) => {
|
.action(async (url, options) => {
|
||||||
await checkUpdateTips();
|
await checkUpdateTips();
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ authors = ["Tw93"]
|
|||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://github.com/tw93/Pake"
|
repository = "https://github.com/tw93/Pake"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = "1.78.0"
|
rust-version = "1.85.0"
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
name = "app_lib"
|
name = "app_lib"
|
||||||
|
|||||||
Reference in New Issue
Block a user