fix: Update/Fix build workflow (#474)
# Update/Fix build workflow - `macos-latest-xlarge` is no longer available. Switch to cheaper runner: `macos-latest-xlarge` -> `macos-latest` - Refactor build to run matrix job under Linux and macOS - Tune caching GH caching - Add junit and logger properties - Downgrade Junit to 5.14.2 - Extract `ProcessBuilder` creation logic into helper functions - Disable `StdioClientTransportTest` on windows temporary ## How Has This Been Tested? CI ## Breaking Changes Functionally - no. Outdated/broken TypeScript tests were disabled ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Bug fix (non-breaking change which fixes an issue) - [x] CI Update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [ ] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [ ] My code follows the repository's style guidelines - [ ] New and existing tests pass locally - [ ] I have added appropriate error handling - [ ] I have added or updated documentation as needed ## Additional context GitHub actions workflows were blocked because the selected "macos-latest-xlarge" runner, which is not available for the free open-source plan. With "macos-latest" workflow works.
This commit is contained in:
parent
0ba61060c2
commit
288d46cdde
6 changed files with 268 additions and 541 deletions
2
.github/workflows/apidocs.yaml
vendored
2
.github/workflows/apidocs.yaml
vendored
|
|
@ -1,4 +1,4 @@
|
|||
name: Build and Publish API Docs to GitHub Pages
|
||||
name: Publish API Docs
|
||||
|
||||
on:
|
||||
release:
|
||||
|
|
|
|||
162
.github/workflows/build.yml
vendored
162
.github/workflows/build.yml
vendored
|
|
@ -10,69 +10,88 @@ on:
|
|||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
# Cancel only when the run is NOT on `main` branch
|
||||
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
||||
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
||||
|
||||
permissions:
|
||||
checks: write
|
||||
pull-requests: write # only required if `comment: true` was enabled
|
||||
|
||||
env:
|
||||
JAVA_VERSION: 21
|
||||
JAVA_DISTRIBUTION: temurin
|
||||
JAVA_OPTS: "-Dfile.encoding=UTF-8 -Djava.awt.headless=true"
|
||||
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process"
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: macos-latest-xlarge
|
||||
name: Build
|
||||
timeout-minutes: 20
|
||||
env:
|
||||
JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
|
||||
runs-on: ${{ matrix.os }}
|
||||
name: Build (${{ matrix.job-name }})
|
||||
timeout-minutes: 30
|
||||
permissions:
|
||||
contents: read
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- os: ubuntu-latest
|
||||
job-name: "Linux Tests"
|
||||
gradle-tasks: "build ktlintCheck koverLog koverHtmlReport publishToMavenLocal -Pversion=1-SNAPSHOT"
|
||||
max-workers: 3
|
||||
|
||||
- os: windows-latest
|
||||
job-name: "Windows Tests"
|
||||
gradle-tasks: "jvmTest"
|
||||
max-workers: 3
|
||||
|
||||
- os: macos-latest
|
||||
job-name: "iOS Simulator tests"
|
||||
gradle-tasks: "linkIosSimulatorArm64 iosSimulatorArm64Test"
|
||||
max-workers: 2
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Set up JDK 21
|
||||
- name: Set up JDK ${{ env.JAVA_VERSION }}
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '21'
|
||||
distribution: 'temurin'
|
||||
java-version: ${{ env.JAVA_VERSION }}
|
||||
distribution: ${{ env.JAVA_DISTRIBUTION }}
|
||||
|
||||
- name: Set up Node.js
|
||||
if: matrix.os == 'ubuntu-latest'
|
||||
uses: actions/setup-node@v6
|
||||
with:
|
||||
node-version: 'lts/*'
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v5
|
||||
with:
|
||||
validate-wrappers: true
|
||||
add-job-summary: 'always'
|
||||
cache-read-only: true
|
||||
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
|
||||
cache-encryption-key: ${{ secrets.GRADLE_ENCRYPTION_KEY }}
|
||||
gradle-home-cache-includes: |
|
||||
caches
|
||||
notifications
|
||||
sdks
|
||||
.konan/**
|
||||
|
||||
- name: Build with Gradle
|
||||
- name: ${{ matrix.job-name }}
|
||||
run: |-
|
||||
./gradlew --no-daemon \
|
||||
--rerun-tasks \
|
||||
clean \
|
||||
ktlintCheck \
|
||||
build \
|
||||
-x :conformance-test:test \
|
||||
koverLog koverHtmlReport \
|
||||
publishToMavenLocal \
|
||||
-Pversion=0.0.1-SNAPSHOT
|
||||
|
||||
- name: Build Kotlin-MCP-Client Sample
|
||||
working-directory: ./samples/kotlin-mcp-client
|
||||
run: ./gradlew --no-daemon clean build -Pmcp.kotlin.overrideVersion=0.0.1-SNAPSHOT
|
||||
|
||||
- name: Build Kotlin-MCP-Server Sample
|
||||
working-directory: ./samples/kotlin-mcp-server
|
||||
run: ./gradlew --no-daemon clean build -Pmcp.kotlin.overrideVersion=0.0.1-SNAPSHOT
|
||||
|
||||
- name: Build Weather-Stdio-Server Sample
|
||||
working-directory: ./samples/weather-stdio-server
|
||||
run: ./gradlew --no-daemon clean build -Pmcp.kotlin.overrideVersion=0.0.1-SNAPSHOT
|
||||
./gradlew ${{ matrix.gradle-tasks }} -x :conformance-test:test --max-workers ${{ matrix.max-workers }} --continue --configure-on-demand --parallel
|
||||
|
||||
- name: Upload Reports
|
||||
if: ${{ !cancelled() }}
|
||||
uses: actions/upload-artifact@v5
|
||||
if: always()
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: reports
|
||||
name: reports-build-${{ matrix.os }}
|
||||
path: |
|
||||
**/build/reports/
|
||||
|
||||
- name: Publish Test Report
|
||||
uses: mikepenz/action-junit-report@v6
|
||||
if: ${{ !cancelled() }} # always run even if the previous step fails
|
||||
if: always()
|
||||
with:
|
||||
annotate_only: true
|
||||
detailed_summary: true
|
||||
|
|
@ -83,9 +102,68 @@ jobs:
|
|||
report_paths: '**/test-results/**/TEST-*.xml'
|
||||
truncate_stack_traces: false
|
||||
|
||||
- name: Disable Auto-Merge on Fail
|
||||
if: failure() && github.event_name == 'pull_request'
|
||||
run: gh pr merge --disable-auto "$PR_URL"
|
||||
env:
|
||||
PR_URL: ${{github.event.pull_request.html_url}}
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
- name: Archive Maven Local Repository
|
||||
if: ${{ success() && matrix.os == 'ubuntu-latest' }}
|
||||
run: |
|
||||
cd ~/.m2/repository && zip -r $GITHUB_WORKSPACE/local-maven-repository.zip .
|
||||
|
||||
- name: Upload Maven Local Repository
|
||||
if: ${{ success() && matrix.os == 'ubuntu-latest' }}
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: local-maven-repository
|
||||
path: local-maven-repository.zip
|
||||
retention-days: 1
|
||||
|
||||
samples:
|
||||
needs: [ build ]
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
sample:
|
||||
- kotlin-mcp-client
|
||||
- kotlin-mcp-server
|
||||
- weather-stdio-server
|
||||
|
||||
name: "Build Sample: ${{ matrix.sample }}"
|
||||
timeout-minutes: 10
|
||||
env:
|
||||
JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Set up JDK ${{ env.JAVA_VERSION }}
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: ${{ env.JAVA_VERSION }}
|
||||
distribution: ${{ env.JAVA_DISTRIBUTION }}
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v5
|
||||
with:
|
||||
add-job-summary: 'always'
|
||||
cache-read-only: true
|
||||
|
||||
- name: Download Maven Local Repository
|
||||
uses: actions/download-artifact@v7
|
||||
with:
|
||||
name: local-maven-repository
|
||||
path: .
|
||||
|
||||
- name: Extract Maven Local Repository
|
||||
run: |
|
||||
mkdir -p ~/.m2/repository
|
||||
unzip -o local-maven-repository.zip -d ~/.m2/repository
|
||||
|
||||
- name: "Build Sample: ${{ matrix.sample }}"
|
||||
working-directory: ./samples/${{ matrix.sample }}
|
||||
run: ./gradlew build -Pmcp.kotlin.overrideVersion=1-SNAPSHOT
|
||||
|
||||
- name: Upload Reports
|
||||
if: ${{ !cancelled() }}
|
||||
uses: actions/upload-artifact@v6
|
||||
with:
|
||||
name: reports-samples-snapshot-${{ matrix.sample }}
|
||||
path: |
|
||||
**/build/reports/
|
||||
|
|
|
|||
28
.github/workflows/codeql.yml
vendored
28
.github/workflows/codeql.yml
vendored
|
|
@ -8,10 +8,19 @@ on:
|
|||
schedule:
|
||||
- cron: '0 4 * * 0'
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
||||
|
||||
env:
|
||||
JAVA_VERSION: 21
|
||||
JAVA_DISTRIBUTION: temurin
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze (${{ matrix.language }})
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 30
|
||||
permissions:
|
||||
# required for all workflows
|
||||
security-events: write
|
||||
|
|
@ -24,6 +33,7 @@ jobs:
|
|||
contents: read
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
language: [ java-kotlin ]
|
||||
|
||||
|
|
@ -33,10 +43,11 @@ jobs:
|
|||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- uses: actions/setup-java@v5
|
||||
- name: Set up JDK ${{ env.JAVA_VERSION }}
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
distribution: temurin
|
||||
java-version: '21'
|
||||
distribution: ${{ env.JAVA_DISTRIBUTION }}
|
||||
java-version: ${{ env.JAVA_VERSION }}
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
|
|
@ -45,16 +56,15 @@ jobs:
|
|||
languages: ${{ matrix.language }}
|
||||
build-mode: manual
|
||||
|
||||
- uses: actions/cache@v4
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v5
|
||||
with:
|
||||
path: |
|
||||
~/.gradle/caches
|
||||
~/.gradle/wrapper
|
||||
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
|
||||
validate-wrappers: true
|
||||
cache-read-only: true
|
||||
|
||||
- name: Build Kotlin sources
|
||||
run: |
|
||||
./gradlew \
|
||||
./gradlew \
|
||||
:kotlin-sdk-core:compileKotlinJvm \
|
||||
:kotlin-sdk-client:compileKotlinJvm \
|
||||
:kotlin-sdk-server:compileKotlinJvm \
|
||||
|
|
|
|||
2
.github/workflows/conformance.yml
vendored
2
.github/workflows/conformance.yml
vendored
|
|
@ -14,7 +14,7 @@ concurrency:
|
|||
|
||||
jobs:
|
||||
run-conformance:
|
||||
runs-on: macos-latest-xlarge
|
||||
runs-on: macos-latest
|
||||
name: Run Conformance Tests
|
||||
timeout-minutes: 20
|
||||
env:
|
||||
|
|
|
|||
5
.github/workflows/gradle-publish.yml
vendored
5
.github/workflows/gradle-publish.yml
vendored
|
|
@ -13,10 +13,11 @@ on:
|
|||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: macos-latest-xlarge
|
||||
runs-on: macos-latest
|
||||
environment: release
|
||||
env:
|
||||
JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
|
||||
JAVA_OPTS: "-Xmx4g -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=768m -Djava.awt.headless=true"
|
||||
GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dkotlin.compiler.execution.strategy=in-process"
|
||||
|
||||
permissions:
|
||||
contents: write
|
||||
|
|
|
|||
20
.github/workflows/samples.yml
vendored
20
.github/workflows/samples.yml
vendored
|
|
@ -16,43 +16,49 @@ concurrency:
|
|||
# Cancel only when the run is NOT on `main` branch
|
||||
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
|
||||
|
||||
env:
|
||||
JAVA_VERSION: 21
|
||||
JAVA_DISTRIBUTION: temurin
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
sample:
|
||||
- kotlin-mcp-client
|
||||
- kotlin-mcp-server
|
||||
- weather-stdio-server
|
||||
|
||||
name: Build Sample
|
||||
name: Build Sample (${{ matrix.sample }})
|
||||
timeout-minutes: 10
|
||||
env:
|
||||
JAVA_OPTS: "-Xmx8g -Dfile.encoding=UTF-8 -Djava.awt.headless=true -Dkotlin.daemon.jvm.options=-Xmx6g"
|
||||
steps:
|
||||
- uses: actions/checkout@v6
|
||||
|
||||
- name: Set up JDK 21
|
||||
- name: Set up JDK ${{ env.JAVA_VERSION }}
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: 21
|
||||
distribution: 'temurin'
|
||||
java-version: ${{ env.JAVA_VERSION }}
|
||||
distribution: ${{ env.JAVA_DISTRIBUTION }}
|
||||
|
||||
- name: Setup Gradle
|
||||
uses: gradle/actions/setup-gradle@v5
|
||||
with:
|
||||
validate-wrappers: true
|
||||
add-job-summary: 'always'
|
||||
cache-read-only: true
|
||||
cache-read-only: ${{ github.ref != 'refs/heads/main' }}
|
||||
|
||||
- name: "Build Sample: ${{ matrix.sample }}"
|
||||
working-directory: ./samples/${{ matrix.sample }}
|
||||
run: ./gradlew --no-daemon clean build
|
||||
run: ./gradlew --no-daemon build
|
||||
|
||||
- name: Upload Reports
|
||||
if: ${{ !cancelled() }}
|
||||
uses: actions/upload-artifact@v5
|
||||
with:
|
||||
name: reports-${{ matrix.sample }}
|
||||
name: reports-samples-${{ matrix.sample }}
|
||||
path: |
|
||||
**/build/reports/
|
||||
|
|
|
|||
Loading…
Reference in a new issue