Skip to content

Commit 10f61a4

Browse files
xaionaro@dx.centerxaionaro@dx.center
authored andcommitted
ci: add jnimcp to release, CI, and e2e workflows
- Add jnimcp-linux and jnimcp-android to release artifacts - Add jnimcp to CI build matrix, test, vet, and lint targets - Add dist-jnimcp-android to Makefile dist target - Bump Go version to 1.25 across all workflows (required by go-sdk)
1 parent 793411c commit 10f61a4

4 files changed

Lines changed: 19 additions & 11 deletions

File tree

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818

1919
- uses: actions/setup-go@v5
2020
with:
21-
go-version: "1.24.x"
21+
go-version: "1.25.x"
2222

2323
- name: Run unit tests
24-
run: go test ./grpc/server/acl/ ./grpc/server/certauth/ ./tools/...
24+
run: go test ./grpc/server/acl/ ./grpc/server/certauth/ ./mcp/ ./tools/...
2525

2626
vet:
2727
name: Vet
@@ -31,24 +31,24 @@ jobs:
3131

3232
- uses: actions/setup-go@v5
3333
with:
34-
go-version: "1.24.x"
34+
go-version: "1.25.x"
3535

3636
- name: Vet packages
3737
# handlestore requires CGO (imports jni core with JNI headers)
38-
run: go vet ./grpc/server/acl/ ./grpc/server/certauth/ ./tools/...
38+
run: go vet ./grpc/server/acl/ ./grpc/server/certauth/ ./mcp/ ./tools/...
3939

4040
build:
4141
name: Build binaries
4242
runs-on: ubuntu-latest
4343
strategy:
4444
matrix:
45-
binary: [jnicli, jniserviceadmin]
45+
binary: [jnicli, jnimcp, jniserviceadmin]
4646
steps:
4747
- uses: actions/checkout@v4
4848

4949
- uses: actions/setup-go@v5
5050
with:
51-
go-version: "1.24.x"
51+
go-version: "1.25.x"
5252

5353
- name: Build (linux/amd64)
5454
env:
@@ -68,11 +68,11 @@ jobs:
6868

6969
- uses: actions/setup-go@v5
7070
with:
71-
go-version: "1.24.x"
71+
go-version: "1.25.x"
7272

7373
- name: Install golangci-lint v2
7474
run: go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest
7575

7676
- name: Lint
7777
# handlestore requires CGO (imports jni core with JNI headers)
78-
run: golangci-lint run --build-tags="" ./grpc/server/acl/ ./grpc/server/certauth/ ./tools/... ./cmd/jnicli/ ./cmd/jniserviceadmin/
78+
run: golangci-lint run --build-tags="" ./grpc/server/acl/ ./grpc/server/certauth/ ./mcp/ ./tools/... ./cmd/jnicli/ ./cmd/jnimcp/ ./cmd/jniserviceadmin/

.github/workflows/e2e.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- uses: actions/setup-go@v5
1717
with:
18-
go-version: '1.24'
18+
go-version: '1.25'
1919
cache: true
2020

2121
- name: Set up JDK 17

.github/workflows/release.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- uses: actions/setup-go@v5
2828
with:
29-
go-version: '1.24'
29+
go-version: '1.25'
3030
cache: true
3131

3232
- name: Set up JDK 17
@@ -84,6 +84,14 @@ jobs:
8484
cp build/jnicli-android-${{ matrix.goarch }} \
8585
"release/jnicli-${TAG}-android-${ABI}"
8686
87+
# MCP server for Linux hosts
88+
cp build/jnimcp-linux-${{ matrix.goarch }} \
89+
"release/jnimcp-${TAG}-linux-${{ matrix.goarch }}"
90+
91+
# MCP server for Android devices
92+
cp build/jnimcp-android-${{ matrix.goarch }} \
93+
"release/jnimcp-${TAG}-android-${ABI}"
94+
8795
# Admin tool for Android devices
8896
cp build/jniserviceadmin-android-${{ matrix.goarch }} \
8997
"release/jniserviceadmin-${TAG}-android-${ABI}"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ endif
153153

154154
DIST_CC := $(DIST_NDK)/toolchains/llvm/prebuilt/linux-x86_64/bin/$(DIST_NDK_TRIPLE)$(DIST_API_LEVEL)-clang
155155

156-
dist: dist-jnicli-linux dist-jnicli-android dist-jnimcp-linux dist-jniservice dist-jniserviceadmin dist-dex
156+
dist: dist-jnicli-linux dist-jnicli-android dist-jnimcp-linux dist-jnimcp-android dist-jniservice dist-jniserviceadmin dist-dex
157157

158158
dist-jnicli-linux:
159159
@mkdir -p build

0 commit comments

Comments
 (0)