Skip to content

Commit 4fb6f8a

Browse files
authored
Merge pull request #32 from daydreamsai/sync/upstream-release-v2026.3.2
chore: sync upstream v2026.3.2
2 parents c33f0c3 + b7d1b5d commit 4fb6f8a

File tree

2,119 files changed

+121007
-55220
lines changed

Some content is hidden

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

2,119 files changed

+121007
-55220
lines changed

.dockerignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@ vendor/
5151
# Keep the rest of apps/ and vendor/ excluded to avoid a large build context.
5252
!apps/shared/
5353
!apps/shared/OpenClawKit/
54+
!apps/shared/OpenClawKit/Sources/
55+
!apps/shared/OpenClawKit/Sources/OpenClawKit/
56+
!apps/shared/OpenClawKit/Sources/OpenClawKit/Resources/
57+
!apps/shared/OpenClawKit/Sources/OpenClawKit/Resources/tool-display.json
5458
!apps/shared/OpenClawKit/Tools/
5559
!apps/shared/OpenClawKit/Tools/CanvasA2UI/
5660
!apps/shared/OpenClawKit/Tools/CanvasA2UI/**

.github/actionlint.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ self-hosted-runner:
88
- blacksmith-8vcpu-windows-2025
99
- blacksmith-16vcpu-ubuntu-2404
1010
- blacksmith-16vcpu-windows-2025
11+
- blacksmith-32vcpu-windows-2025
1112
- blacksmith-16vcpu-ubuntu-2404-arm
1213

1314
# Ignore patterns for known issues

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

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Setup Node environment
22
description: >
33
Initialize submodules with retry, install Node 22, pnpm, optionally Bun,
4-
and run pnpm install. Requires actions/checkout to run first.
4+
and optionally run pnpm install. Requires actions/checkout to run first.
55
inputs:
66
node-version:
77
description: Node.js version to install.
@@ -15,6 +15,14 @@ inputs:
1515
description: Whether to install Bun alongside Node.
1616
required: false
1717
default: "true"
18+
use-sticky-disk:
19+
description: Use Blacksmith sticky disks for pnpm store caching.
20+
required: false
21+
default: "false"
22+
install-deps:
23+
description: Whether to run pnpm install after environment setup.
24+
required: false
25+
default: "true"
1826
frozen-lockfile:
1927
description: Whether to use --frozen-lockfile for install.
2028
required: false
@@ -40,13 +48,14 @@ runs:
4048
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4.4.0
4149
with:
4250
node-version: ${{ inputs.node-version }}
43-
check-latest: true
51+
check-latest: false
4452

4553
- name: Setup pnpm + cache store
4654
uses: ./.github/actions/setup-pnpm-store-cache
4755
with:
4856
pnpm-version: ${{ inputs.pnpm-version }}
4957
cache-key-suffix: "node22"
58+
use-sticky-disk: ${{ inputs.use-sticky-disk }}
5059

5160
- name: Setup Bun
5261
if: inputs.install-bun == 'true'
@@ -63,10 +72,12 @@ runs:
6372
if command -v bun &>/dev/null; then bun -v; fi
6473
6574
- name: Capture node path
75+
if: inputs.install-deps == 'true'
6676
shell: bash
6777
run: echo "NODE_BIN=$(dirname "$(node -p "process.execPath")")" >> "$GITHUB_ENV"
6878

6979
- name: Install dependencies
80+
if: inputs.install-deps == 'true'
7081
shell: bash
7182
env:
7283
CI: "true"

.github/actions/setup-pnpm-store-cache/action.yml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ inputs:
99
description: Suffix appended to the cache key.
1010
required: false
1111
default: "node22"
12+
use-sticky-disk:
13+
description: Use Blacksmith sticky disks instead of actions/cache for pnpm store.
14+
required: false
15+
default: "false"
16+
use-restore-keys:
17+
description: Whether to use restore-keys fallback for actions/cache.
18+
required: false
19+
default: "true"
20+
use-actions-cache:
21+
description: Whether to restore/save pnpm store with actions/cache.
22+
required: false
23+
default: "true"
1224
runs:
1325
using: composite
1426
steps:
@@ -38,7 +50,22 @@ runs:
3850
shell: bash
3951
run: echo "path=$(pnpm store path --silent)" >> "$GITHUB_OUTPUT"
4052

41-
- name: Restore pnpm store cache
53+
- name: Mount pnpm store sticky disk
54+
if: inputs.use-sticky-disk == 'true'
55+
uses: useblacksmith/stickydisk@v1
56+
with:
57+
key: ${{ github.repository }}-pnpm-store-${{ runner.os }}-${{ inputs.cache-key-suffix }}
58+
path: ${{ steps.pnpm-store.outputs.path }}
59+
60+
- name: Restore pnpm store cache (exact key only)
61+
if: inputs.use-actions-cache == 'true' && inputs.use-sticky-disk != 'true' && inputs.use-restore-keys != 'true'
62+
uses: actions/cache@v4
63+
with:
64+
path: ${{ steps.pnpm-store.outputs.path }}
65+
key: ${{ runner.os }}-pnpm-store-${{ inputs.cache-key-suffix }}-${{ hashFiles('pnpm-lock.yaml') }}
66+
67+
- name: Restore pnpm store cache (with fallback keys)
68+
if: inputs.use-actions-cache == 'true' && inputs.use-sticky-disk != 'true' && inputs.use-restore-keys == 'true'
4269
uses: actions/cache@v4
4370
with:
4471
path: ${{ steps.pnpm-store.outputs.path }}

0 commit comments

Comments
 (0)