Skip to content

Commit e4d3416

Browse files
authored
Merge pull request #112 from TrueNine/dev
dev
2 parents b967087 + 40bcb21 commit e4d3416

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+2600
-1162
lines changed

.github/actions/setup-node-pnpm/action.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ inputs:
55
node-version:
66
description: Node.js version
77
required: false
8-
default: "25"
8+
default: "25.6.1"
9+
pnpm-version:
10+
description: pnpm version
11+
required: false
12+
default: "10.33.0"
913
install:
1014
description: Whether to run pnpm install
1115
required: false
@@ -16,6 +20,8 @@ runs:
1620
steps:
1721
- name: Setup pnpm
1822
uses: pnpm/action-setup@v4
23+
with:
24+
version: ${{ inputs.pnpm-version }}
1925

2026
- name: Setup Node
2127
uses: actions/setup-node@v6
Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
name: Setup Rust
2-
description: Install Rust stable toolchain with cargo cache
2+
description: Install pinned Rust toolchain with cargo cache
33

44
inputs:
5+
rust-version:
6+
description: Rust toolchain version
7+
required: false
8+
default: "1.88.0"
59
targets:
610
description: Additional Rust targets to install (comma-separated)
711
required: false
8-
default: ''
12+
default: ""
913
cache-key:
1014
description: Extra cache key suffix for cargo
1115
required: false
12-
default: 'default'
16+
default: "default"
1317
cache-paths:
1418
description: Additional paths to cache (newline-separated), appended to ~/.cargo/registry and ~/.cargo/git
1519
required: false
16-
default: 'target'
20+
default: "target"
1721

1822
runs:
1923
using: composite
2024
steps:
21-
- name: Install Rust stable
25+
- name: Install Rust toolchain
2226
uses: dtolnay/rust-toolchain@stable
2327
with:
28+
toolchain: ${{ inputs.rust-version }}
2429
targets: ${{ inputs.targets }}
2530

2631
- name: Cache cargo
@@ -30,7 +35,8 @@ runs:
3035
~/.cargo/registry
3136
~/.cargo/git
3237
${{ inputs.cache-paths }}
33-
key: ${{ runner.os }}-cargo-${{ inputs.cache-key }}-${{ hashFiles('Cargo.lock') }}
38+
key: ${{ runner.os }}-cargo-${{ inputs.rust-version }}-${{ inputs.cache-key }}-${{ hashFiles('Cargo.lock') }}
3439
restore-keys: |
35-
${{ runner.os }}-cargo-${{ inputs.cache-key }}-
40+
${{ runner.os }}-cargo-${{ inputs.rust-version }}-${{ inputs.cache-key }}-
41+
${{ runner.os }}-cargo-${{ inputs.rust-version }}-
3642
${{ runner.os }}-cargo-

.github/actions/setup-tauri/action.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@ name: Setup Tauri Build
22
description: Common Tauri GUI build setup - cargo cache with deps-only hash, version sync, route generation
33

44
inputs:
5+
rust-version:
6+
description: Rust toolchain version
7+
required: false
8+
default: "1.93.1"
59
rust-targets:
610
description: Rust targets to install (comma-separated)
711
required: false
8-
default: ''
12+
default: ""
913
signing-private-key:
1014
description: Tauri updater signing private key content
1115
required: false
12-
default: ''
16+
default: ""
1317
signing-private-key-password:
1418
description: Tauri updater signing private key password
1519
required: false
16-
default: ''
20+
default: ""
1721
version:
1822
description: Version string to sync into Cargo.toml and tauri.conf.json
1923
required: true
@@ -45,9 +49,10 @@ runs:
4549
patchelf \
4650
libssl-dev
4751
48-
- name: Install Rust stable
52+
- name: Install Rust toolchain
4953
uses: dtolnay/rust-toolchain@stable
5054
with:
55+
toolchain: ${{ inputs.rust-version }}
5156
targets: ${{ inputs.rust-targets }}
5257

5358
- name: Normalize Tauri signing key
@@ -86,8 +91,9 @@ runs:
8691
~/.cargo/registry
8792
~/.cargo/git
8893
target
89-
key: ${{ runner.os }}-cargo-${{ steps.cargo-deps-hash.outputs.hash }}
94+
key: ${{ runner.os }}-cargo-${{ inputs.rust-version }}-${{ steps.cargo-deps-hash.outputs.hash }}
9095
restore-keys: |
96+
${{ runner.os }}-cargo-${{ inputs.rust-version }}-
9197
${{ runner.os }}-cargo-
9298
9399
- name: Sync Tauri version

.github/workflows/release-cli.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Release Packages
22

33
env:
4-
NODE_VERSION: '25'
4+
NODE_VERSION: "25.6.1"
55
NPM_REGISTRY_URL: https://registry.npmjs.org/
6-
NPM_PUBLISH_VERIFY_ATTEMPTS: '90'
7-
NPM_PUBLISH_VERIFY_DELAY_SECONDS: '10'
6+
NPM_PUBLISH_VERIFY_ATTEMPTS: "90"
7+
NPM_PUBLISH_VERIFY_DELAY_SECONDS: "10"
88
CLI_NATIVE_MODULE_DIRS: |
99
libraries/logger
1010
libraries/md-compiler
@@ -239,7 +239,7 @@ jobs:
239239
- uses: actions/checkout@v6
240240
- uses: ./.github/actions/setup-node-pnpm
241241
with:
242-
install: 'false'
242+
install: "false"
243243
- name: Setup npm registry
244244
uses: actions/setup-node@v6
245245
with:

0 commit comments

Comments
 (0)