Skip to content

Commit 7b20cda

Browse files
committed
fixup! Run PR validation on multiple OS
1 parent 19a099e commit 7b20cda

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
include:
2323
- os: macos-latest-xlarge
2424
name: "macOS"
25-
java-opts: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g -DexcludeDockerTests=true"
25+
java-opts: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
2626
gradle-task: "clean ktlintCheck assemble macosArm64Test macosX64Test jvmTest koverLog koverHtmlReport"
2727
test-type: "macos"
2828
- os: ubuntu-latest
@@ -32,8 +32,7 @@ jobs:
3232
test-type: "ubuntu"
3333
env:
3434
JAVA_OPTS: "${{ matrix.java-opts }}"
35-
TS_SDK_IMAGE: "registry.jetbrains.team/p/grazi/grazie-infra-public/typescript-sdk-mcp@sha256:97db9969e988c566c87c1c1b64605c6ce333a6db84d702339c8670987e8e8064"
36-
DOCKER_DEFAULT_PLATFORM: "linux/amd64"
35+
TS_SDK_IMAGE: "registry.jetbrains.team/p/grazi/grazie-infra-public/typescript-sdk-mcp@sha256:69f7762ec271b768b10e2d383e1dbc135c4df38a314a75c1ef35e9ff42276cb4"
3736
steps:
3837
- uses: actions/checkout@v5
3938

kotlin-sdk-test/build.gradle.kts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@ kotlin {
1111
excludeTestsMatching("*.typescript.*")
1212
}
1313
}
14-
// Pass DOCKER_DEFAULT_PLATFORM to test process for Testcontainers
15-
System.getenv("DOCKER_DEFAULT_PLATFORM")?.let { platform ->
16-
environment("DOCKER_DEFAULT_PLATFORM", platform)
17-
}
1814
}
1915
}
2016
sourceSets {

kotlin-sdk-test/src/jvmTest/kotlin/io/modelcontextprotocol/kotlin/sdk/integration/utils/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
# Docker image for running TypeScript SDK test servers/clients with SSE over HTTP and STDIO
2+
# Be sure to build it for amd64 architecture with the following command:
3+
# `docker buildx build --platform linux/amd64 -t registry.jetbrains.team/p/grazi/grazie-infra-public/typescript-sdk-mcp:latest --push .`
24

3-
FROM --platform=linux/amd64 node:20-alpine AS base
5+
FROM node:20-alpine AS base
46

57
# 1) System deps
68
RUN apk add --no-cache git

0 commit comments

Comments
 (0)