From 8ac94fcb2d652f83b2bd586c42d812f0c50207ea Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 16 Jan 2026 13:24:11 -0500 Subject: [PATCH 1/2] Matrix Build For Java 21 and 25 --- .github/workflows/build-pr.yml | 19 ++++++++++++++++++- build.gradle | 6 ++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 3c25a38..6b45e3c 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -6,14 +6,18 @@ on: jobs: build: + strategy: + matrix: + jdk: [ 21, 25 ] runs-on: ubuntu-latest env: BUILD_EVENT: ${{ github.event_name }} + TARGET_COMPATIBILITY: ${{ matrix.jdk }} steps: - name: Setup JDK uses: actions/setup-java@v5 with: - java-version: '21' + java-version: ${{ matrix.jdk }} distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v5 @@ -29,3 +33,16 @@ jobs: uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.COVERALLS_REPO_TOKEN }} + parallel: true + flag-name: jdk-${{ matrix.jdk }} + + coveralls-finish: + needs: build + runs-on: ubuntu-latest + steps: + - name: Coveralls Finish + uses: coverallsapp/github-action@v2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + parallel-finished: true # Important: signals completion of parallel builds + carryforward: "jdk-21" \ No newline at end of file diff --git a/build.gradle b/build.gradle index a6e04a6..fd3e5e9 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,10 @@ group = 'io.synadia' def isRelease = System.getenv("BUILD_EVENT") == "release" def tc = System.getenv("TARGET_COMPATIBILITY") def targetCompat = tc == "25" ? JavaVersion.VERSION_25 : JavaVersion.VERSION_21 -def jarEnd = tc == "25" ? "-jdk25" : "" +def jarEnd = tc == "25" ? "-jdk25" : "" +def bundleEnd = tc == "25" ? ".jdk25" : "" def jarAndArtifactName = "jnats-json" + jarEnd +def bundleName = "io.synadia.jnats.json" + bundleEnd version = isRelease ? jarVersion : jarVersion + "-SNAPSHOT" // version is the variable the build actually uses. @@ -49,7 +51,7 @@ tasks.register('bundle', Bundle) { jar { bundle { - bnd("Bundle-Name": "io.synadia.jnats.json", + bnd("Bundle-Name": bundleName, "Bundle-Vendor": "synadia.io", "Bundle-Description": "JNats JSON Utility", "Bundle-DocURL": "https://github.com/synadia-io/jnats.json", From 3e831094576061c2ee0041b12d7e02342366f1d0 Mon Sep 17 00:00:00 2001 From: scottf Date: Fri, 16 Jan 2026 14:12:36 -0500 Subject: [PATCH 2/2] Matrix Build For Java 21 and 25 --- .github/workflows/build-main.yml | 19 ++++++++++++++++++- .github/workflows/build-pr.yml | 2 +- .github/workflows/build-release.yml | 6 +++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml index 318fb15..3393743 100644 --- a/.github/workflows/build-main.yml +++ b/.github/workflows/build-main.yml @@ -7,9 +7,13 @@ on: jobs: build: + strategy: + matrix: + jdk: [ 21, 25 ] runs-on: ubuntu-latest env: BUILD_EVENT: ${{ github.event_name }} + TARGET_COMPATIBILITY: ${{ matrix.jdk }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }} SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} @@ -19,7 +23,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v5 with: - java-version: '21' + java-version: ${{ matrix.jdk }} distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v5 @@ -35,5 +39,18 @@ jobs: uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.COVERALLS_REPO_TOKEN }} + parallel: true + flag-name: jdk-${{ matrix.jdk }} - name: Publish Snapshot run: ./gradlew -i publishToSonatype + + coveralls-finish: + needs: build + runs-on: ubuntu-latest + steps: + - name: Coveralls Finish + uses: coverallsapp/github-action@v2 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + parallel-finished: true + carryforward: "jdk-21" \ No newline at end of file diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml index 6b45e3c..90aa2e9 100644 --- a/.github/workflows/build-pr.yml +++ b/.github/workflows/build-pr.yml @@ -44,5 +44,5 @@ jobs: uses: coverallsapp/github-action@v2 with: github-token: ${{ secrets.GITHUB_TOKEN }} - parallel-finished: true # Important: signals completion of parallel builds + parallel-finished: true carryforward: "jdk-21" \ No newline at end of file diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml index be90a0a..ffd471e 100644 --- a/.github/workflows/build-release.yml +++ b/.github/workflows/build-release.yml @@ -8,9 +8,13 @@ on: jobs: build: + strategy: + matrix: + jdk: [ 21, 25 ] runs-on: ubuntu-latest env: BUILD_EVENT: ${{ github.event_name }} + TARGET_COMPATIBILITY: ${{ matrix.jdk }} OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }} OSSRH_PASSWORD: ${{ secrets.OSSRH_TOKEN }} SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }} @@ -20,7 +24,7 @@ jobs: - name: Setup JDK uses: actions/setup-java@v5 with: - java-version: '21' + java-version: ${{ matrix.jdk }} distribution: 'temurin' - name: Setup Gradle uses: gradle/actions/setup-gradle@v5