Skip to content

Commit 66f9f6d

Browse files
committed
Merge branch 'main' of ssh://git.biggo.com:222/john/dive
2 parents 2258324 + 500a1a1 commit 66f9f6d

Some content is hidden

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

94 files changed

+13033
-5280
lines changed

.github/workflows/release.yml

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,25 @@ jobs:
8484
with:
8585
version: "0.7.22"
8686

87+
# - name: install Rust stable
88+
# uses: dtolnay/rust-toolchain@stable
89+
# with:
90+
# targets: ${{ matrix.platform == 'darwin' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
91+
#
92+
# - name: Install ziglang
93+
# if: matrix.platform == 'linux'
94+
# uses: mlugg/setup-zig@v2
95+
# with:
96+
# version: 0.14.1
97+
#
98+
# - name: Install cargo toolchains
99+
# if: matrix.platform == 'linux'
100+
# uses: taiki-e/install-action@v2
101+
# env:
102+
# GITHUB_TOKEN: ${{ github.token }}
103+
# with:
104+
# tool: cargo-zigbuild
105+
87106
- name: Install dependencies
88107
run: npm ci && uv sync --project mcp-host
89108

@@ -106,6 +125,9 @@ jobs:
106125
if: matrix.platform == 'windows'
107126
shell: bash
108127
run: |
128+
# cargo build -p dive-mcp --release --features local_ipc
129+
# cp target/release/dive-mcp.exe prebuilt/
130+
# npm run build:core-js
109131
npm run package:windows
110132
ls -al release/${{ env.VERSION }}
111133
echo "Moving exe file to output directory"
@@ -119,6 +141,12 @@ jobs:
119141
APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
120142
APPLETEAMID: ${{ secrets.APPLETEAMID }}
121143
run: |
144+
# cargo build -p dive-mcp --release --features local_ipc --target x86_64-apple-darwin
145+
# cp target/release/x86_64-apple-darwin/dive-mcp prebuilt/dive-mcp-x86_64
146+
# cargo build -p dive-mcp --release --features local_ipc --target aarch64-apple-darwin
147+
# cp target/release/aarch64-apple-darwin/dive-mcp prebuilt/dive-mcp-aarch64
148+
# npm run build:core-js -- --target x86_64-apple-darwin
149+
# npm run build:core-js -- --target aarch64-apple-darwin
122150
npm run package:darwin
123151
ls -al release/${{ env.VERSION }}
124152
echo "Moving dmg, zip file to output directory"
@@ -129,7 +157,9 @@ jobs:
129157
- name: Build Linux
130158
if: matrix.platform == 'linux'
131159
run: |
132-
npm run package:linux
160+
# cargo zigbuild -p dive-mcp --target x86_64-unknown-linux-gnu.2.17 --release --features local_ipc
161+
# cp target/x86_64-unknown-linux-gnu/release/dive-mcp prebuilt/
162+
# npm run build:core-js -- --use-napi-cross
133163
ls -al release/${{ env.VERSION }}
134164
echo "Moving AppImage and tar.gz files to output directory"
135165
mv release/${{ env.VERSION }}/*.{AppImage,tar.gz} output/
@@ -162,10 +192,12 @@ jobs:
162192
args: ''
163193
config: ''
164194
os_name: 'linux-x64'
195+
mcp_bin_name: 'dive-mcp'
165196
- platform: 'windows-latest'
166197
args: ''
167198
config: ''
168199
os_name: 'windows-x64'
200+
mcp_bin_name: 'dive-mcp.exe'
169201
# - platform: 'windows-latest'
170202
# args: '--config src-tauri/tauri.microsoftstore.conf.json'
171203
# config: 'microsoftstore'
@@ -174,10 +206,12 @@ jobs:
174206
# args: '--target aarch64-apple-darwin'
175207
# config: ''
176208
# os_name: 'macos-arm64'
209+
# mcp_bin_name: ''
177210
# - platform: 'macos-latest' # for Intel based macs.
178211
# args: '--target x86_64-apple-darwin'
179212
# config: ''
180213
# os_name: 'macos-x64'
214+
# mcp_bin_name: ''
181215

182216
runs-on: ${{ matrix.platform }}
183217
steps:
@@ -249,6 +283,20 @@ jobs:
249283
- name: install frontend dependencies
250284
run: npm ci
251285

286+
# - name: Build dive mcp
287+
# if: matrix.platform != 'macos-latest'
288+
# run: |
289+
# cargo build -p dive-mcp --release --features local_ipc
290+
# cp target/release/${{ matrix.mcp_bin_name }} prebuilt/
291+
292+
# - name: Build dive mcp
293+
# if: matrix.platform == 'macos-latest'
294+
# run: |
295+
# cargo build -p dive-mcp --release --features local_ipc --target x86_64-apple-darwin
296+
# cp target/release/x86_64-apple-darwin/dive-mcp prebuilt/dive-mcp-x86_64
297+
# cargo build -p dive-mcp --release --features local_ipc --target aarch64-apple-darwin
298+
# cp target/release/aarch64-apple-darwin/dive-mcp prebuilt/dive-mcp-aarch64
299+
252300
- uses: tauri-apps/tauri-action@v0
253301
env:
254302
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -273,4 +321,4 @@ jobs:
273321
S3_DOMAIN: ${{ secrets.OAP_S3_DOMAIN }}
274322
shell: bash
275323
run: |
276-
./scripts/publish-to-oap.sh tauri
324+
./scripts/publish-to-oap.sh tauri

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,4 +48,10 @@ host-deps/
4848
.config/
4949

5050
# Claude Code configuration
51-
CLAUDE.md
51+
CLAUDE.md
52+
53+
# rust build cache
54+
packages/*/target/*
55+
target/*
56+
57+
prebuilt/dive-mcp*

0 commit comments

Comments
 (0)