Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/crates-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- "Cargo.toml"
- "Cargo.lock"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/crates-ci.yml"
push:
branches: [main]
Expand All @@ -16,6 +17,7 @@ on:
- "Cargo.toml"
- "Cargo.lock"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/crates-ci.yml"
workflow_dispatch:

Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/differ-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- "pnpm-workspace.yaml"
- "package.json"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/differ-ci.yml"
push:
branches: [main]
Expand All @@ -22,6 +23,7 @@ on:
- "pnpm-workspace.yaml"
- "package.json"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/differ-ci.yml"
workflow_dispatch:

Expand All @@ -37,12 +39,9 @@ jobs:
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

# Install hermit (manages node, rust, just)
# Install hermit (manages node, pnpm, rust, just)
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1.1.5

# Enable pnpm via corepack (node ships with corepack; version comes from packageManager in package.json)
- run: corepack enable pnpm

# Cache Cargo dependencies
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/penpal-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
- "pnpm-workspace.yaml"
- "package.json"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/penpal-ci.yml"
push:
branches: [main]
Expand All @@ -18,6 +19,7 @@ on:
- "pnpm-workspace.yaml"
- "package.json"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/penpal-ci.yml"
workflow_dispatch:

Expand All @@ -33,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

# Install hermit (manages node, rust, just, go)
# Install hermit (manages node, pnpm, rust, just, go)
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1.1.5

# Cache Cargo dependencies
Expand All @@ -60,9 +62,6 @@ jobs:
librsvg2-dev \
patchelf

# Enable pnpm via corepack (node ships with corepack; version comes from packageManager in package.json)
- run: corepack enable pnpm

# Install dependencies
- name: Install dependencies
run: |
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/penpal-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
exit 1
fi

# Install hermit (manages node, rust, just, go)
# Install hermit (manages node, pnpm, rust, just, go)
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1.1.5

# Cache Cargo dependencies
Expand All @@ -38,9 +38,6 @@ jobs:
workspaces: apps/penpal/frontend/src-tauri
key: aarch64-apple-darwin

# Enable pnpm via corepack
- run: corepack enable pnpm

# Install dependencies
- name: Install dependencies
run: |
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/staged-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ on:
- "pnpm-workspace.yaml"
- "package.json"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/staged-ci.yml"
push:
branches: [main]
Expand All @@ -22,6 +23,7 @@ on:
- "pnpm-workspace.yaml"
- "package.json"
- "rust-toolchain.toml"
- "bin/**"
- ".github/workflows/staged-ci.yml"
workflow_dispatch:

Expand All @@ -37,12 +39,9 @@ jobs:
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3

# Install hermit (manages node, rust, just)
# Install hermit (manages node, pnpm, rust, just)
- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1.1.5

# Enable pnpm via corepack (node ships with corepack; version comes from packageManager in package.json)
- run: corepack enable pnpm

# Cache Cargo dependencies
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/staged-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ jobs:

- uses: cashapp/activate-hermit@cea9af7913204a965fd488637a8d1811bba2e616 # v1.1.5

- run: corepack enable pnpm

- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
with:
workspaces: apps/staged/src-tauri
Expand Down
2 changes: 1 addition & 1 deletion apps/staged/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ release version:

echo "Pushed tag staged/v{{version}} — CI will build and publish the release."

# Fetch official Node.js release checksums and update node-runtime.lock.json (e.g. `just bump-node-runtime v24.12.0`)
# Fetch official Node.js release checksums and update node-runtime.lock.json (e.g. `just bump-node-runtime v24.21.0`)
bump-node-runtime *ARGS:
node scripts/update-node-runtime-lock.mjs {{ ARGS }}

Expand Down
18 changes: 9 additions & 9 deletions apps/staged/node-runtime.lock.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
{
"version": "v24.11.0",
"version": "v24.21.0",
"artifacts": {
"aarch64-apple-darwin": {
"filename": "node-v24.11.0-darwin-arm64.tar.gz",
"sha256": "0be2ab2816a4fa02d1acff014a434f29f56d8d956f5af6a98b70ced6c5f4d201"
"filename": "node-v24.21.0-darwin-arm64.tar.gz",
"sha256": "bed7eea5325e1108f32ce5228ddd6a5f0f08a499ee42aa7442aea583702f6057"
},
"aarch64-unknown-linux-gnu": {
"filename": "node-v24.11.0-linux-arm64.tar.gz",
"sha256": "4786d00c4d259d3ff0b2328307f764ef3ced65f2d6e9502d433e68d66238509d"
"filename": "node-v24.21.0-linux-arm64.tar.gz",
"sha256": "724282c3b43aec998aa9527380465b45d229e021b58035f5f4f63095eabfe5d5"
},
"x86_64-apple-darwin": {
"filename": "node-v24.11.0-darwin-x64.tar.gz",
"sha256": "3884671e87f46f773832d98a0a6cabcc5ec4f637084f0f3515b69e66ea27f2f1"
"filename": "node-v24.21.0-darwin-x64.tar.gz",
"sha256": "1462cb3b3046b815cf8ea436d3da450ec1a9f11dac7e5a46b0ada5305d7e8097"
},
"x86_64-unknown-linux-gnu": {
"filename": "node-v24.11.0-linux-x64.tar.gz",
"sha256": "b3c071cdf47aab867c3b2aa287257df12ec5d7c962bf922b32fd33226c4295fd"
"filename": "node-v24.21.0-linux-x64.tar.gz",
"sha256": "6e1db87ef58b8819e5d5402eff1536491b18edd8eb7bee5ef7897876e88dc5ff"
}
}
}
2 changes: 1 addition & 1 deletion apps/staged/scripts/update-node-runtime-lock.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ async function main() {
const version = args.version ?? (await currentLockedVersion(args.lockFile));
if (!version) {
throw new Error(
"No version given and no existing lockfile to refresh; pass a version (e.g. v24.11.0)",
"No version given and no existing lockfile to refresh; pass a version (e.g. v24.21.0)",
);
}

Expand Down
4 changes: 2 additions & 2 deletions apps/staged/src-tauri/src/managed_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const UPSTREAM_NODE_DIST_BASE_URL: &str = "https://nodejs.org/dist";
const PACKAGES_LOCK_FILENAME: &str = ".lock";

/// Hard cap on the compressed tarball; the largest pinned artifact today is
/// ~49 MB, so anything near this is a wrong or corrupted download.
/// ~55 MiB, so anything near this is a wrong or corrupted download.
const MAX_ARCHIVE_BYTES: u64 = 90 * 1024 * 1024;
const CONNECT_TIMEOUT: Duration = Duration::from_secs(30);
const DOWNLOAD_TIMEOUT: Duration = Duration::from_secs(10 * 60);
Expand All @@ -41,7 +41,7 @@ const PROGRESS_LOG_STEP_BYTES: u64 = 10 * 1024 * 1024;

#[derive(Clone, Debug, serde::Deserialize)]
pub struct NodeRuntimeLock {
/// Pinned Node.js version, `v`-prefixed (`v24.11.0`) — the exact string
/// Pinned Node.js version, `v`-prefixed (`v24.21.0`) — the exact string
/// `node --version` prints.
pub version: String,
/// Rust target triple → release tarball pin.
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion bin/corepack
2 changes: 1 addition & 1 deletion bin/node
2 changes: 1 addition & 1 deletion bin/npm
2 changes: 1 addition & 1 deletion bin/npx
Loading