diff --git a/.github/workflows/jooqx.yml b/.github/workflows/jooqx.yml index ae176fd7..ce48b7b5 100644 --- a/.github/workflows/jooqx.yml +++ b/.github/workflows/jooqx.yml @@ -66,7 +66,7 @@ jobs: itProfile: [ 'postgres:12-alpine', 'postgres:14-alpine', 'postgres:16-alpine', 'h2', 'mysql:8.3', 'mysql:8.0' ] sonarProfile: [ 'postgres:16-alpine' ] fail-fast: false - name: Test ${{ matrix.itProfile }} | Java ${{ matrix.java }} (${{ matrix.os }}) + name: Integtest ${{ matrix.itProfile }} | Java ${{ matrix.java }} (${{ matrix.os }}) with: profile: 'jooqx:sonar' branch: ${{ needs.context.outputs.branch }} @@ -85,13 +85,17 @@ jobs: needs: [ context, build, analysis ] if: needs.context.outputs.shouldPublish == 'true' || needs.context.outputs.isRelease == 'true' uses: zero88/shared-ghactions/.github/workflows/gradle-publish.yml@main + strategy: + matrix: + java: [ '8', '17' ] + os: [ 'ubuntu-latest' ] with: profile: 'jooqx' version: ${{ needs.context.outputs.version }} semanticVersion: ${{ needs.context.outputs.semanticVersion }} hashVersion: ${{ needs.context.outputs.commitId }} isRelease: ${{ needs.context.outputs.isRelease }} - javaVersion: 17 + javaVersion: ${{ matrix.java }} secrets: ossrhUser: ${{ secrets.OSS_SONATYPE_USER }} ossrhToken: ${{ secrets.OSS_SONATYPE_PASSWORD }} diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 71289842..9ff77a39 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -102,4 +102,14 @@ tasks { testFixturesJavadoc { title = "jOOQx Testing ${project.version} API" } + + withType { + // need to override in here, since at root project, test-fixtures is not yet recognized + if (name == "testFixturesJar") { + when (JavaVersion.current().majorVersion) { + "8" -> archiveClassifier.set("test-fixtures-jvm8") + "11" -> archiveClassifier.set("test-fixtures-jvm11") + } + } + } }