Sync GHA matrix property names with sdk repo
MODIFY
.github/workflows/ci.yml
.github/workflows/ci.yml
@@ -41,7 +41,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 8, 15 ]
+ test-java-version:
+ - 8
+ - 15
fail-fast: false
steps:
- uses: actions/checkout@v2.3.4
@@ -49,11 +51,11 @@ jobs:
fetch-depth: 0
- id: setup-test-java
- name: Set up JDK ${{ matrix.java }} for running tests
+ name: Set up JDK ${{ matrix.test-java-version }} for running tests
uses: actions/setup-java@v2
with:
distribution: adopt
- java-version: ${{ matrix.java }}
+ java-version: ${{ matrix.test-java-version }}
- name: Set up JDK 11 for running Gradle
uses: actions/setup-java@v2
@@ -64,7 +66,7 @@ jobs:
- name: Restore cache
uses: burrunan/gradle-cache-action@v1.10
with:
- job-id: jdk${{ matrix.java }}
+ job-id: jdk${{ matrix.test-java-version }}
- name: Cache Gradle Wrapper
uses: actions/cache@v2
@@ -76,7 +78,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- run: ./gradlew test -PtestJavaVersion=${{ matrix.java }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
+ run: ./gradlew test -PtestJavaVersion=${{ matrix.test-java-version }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
testLatestDeps:
runs-on: ubuntu-latest
@@ -112,8 +114,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ windows-latest, ubuntu-latest ]
- suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
+ os:
+ - windows-latest
+ - ubuntu-latest
+ smoke-test-suite:
+ - glassfish
+ - jetty
+ - liberty
+ - tomcat
+ - tomee
+ - wildfly
+ - other
fail-fast: false
steps:
- name: Support longpaths
@@ -145,7 +156,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.suite }}
+ run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}
example-distro:
runs-on: ubuntu-latest

MODIFY
.github/workflows/nightly-no-cache.yml
.github/workflows/nightly-no-cache.yml
@@ -33,7 +33,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 8, 15 ]
+ test-java-version:
+ - 8
+ - 15
fail-fast: false
steps:
- uses: actions/checkout@v2.3.4
@@ -41,11 +43,11 @@ jobs:
fetch-depth: 0
- id: setup-test-java
- name: Set up JDK ${{ matrix.java }} for running tests
+ name: Set up JDK ${{ matrix.test-java-version }} for running tests
uses: actions/setup-java@v2
with:
distribution: adopt
- java-version: ${{ matrix.java }}
+ java-version: ${{ matrix.test-java-version }}
- name: Set up JDK 11 for running Gradle
uses: actions/setup-java@v2
@@ -60,7 +62,7 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Test
- run: ./gradlew test -PtestJavaVersion=${{ matrix.java }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false --no-build-cache
+ run: ./gradlew test -PtestJavaVersion=${{ matrix.test-java-version }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false --no-build-cache
testLatestDeps:
runs-on: ubuntu-latest
@@ -88,8 +90,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ windows-latest, ubuntu-latest ]
- suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
+ os:
+ - windows-latest
+ - ubuntu-latest
+ smoke-test-suite:
+ - glassfish
+ - jetty
+ - liberty
+ - tomcat
+ - tomee
+ - wildfly
+ - other
fail-fast: false
steps:
- name: Support longpaths
@@ -113,7 +124,7 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Test
- run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.suite }} --no-build-cache
+ run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }} --no-build-cache
example-distro:
runs-on: ubuntu-latest

MODIFY
.github/workflows/nightly.yml
.github/workflows/nightly.yml
@@ -41,7 +41,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 8, 15 ]
+ test-java-version:
+ - 8
+ - 15
fail-fast: false
steps:
- uses: actions/checkout@v2.3.4
@@ -49,11 +51,11 @@ jobs:
fetch-depth: 0
- id: setup-test-java
- name: Set up JDK ${{ matrix.java }} for running tests
+ name: Set up JDK ${{ matrix.test-java-version }} for running tests
uses: actions/setup-java@v2
with:
distribution: adopt
- java-version: ${{ matrix.java }}
+ java-version: ${{ matrix.test-java-version }}
- name: Set up JDK 11 for running Gradle
uses: actions/setup-java@v2
@@ -64,7 +66,7 @@ jobs:
- name: Restore cache
uses: burrunan/gradle-cache-action@v1.10
with:
- job-id: jdk${{ matrix.java }}
+ job-id: jdk${{ matrix.test-java-version }}
- name: Cache Gradle Wrapper
uses: actions/cache@v2
@@ -76,7 +78,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- run: ./gradlew test -PtestJavaVersion=${{ matrix.java }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
+ run: ./gradlew test -PtestJavaVersion=${{ matrix.test-java-version }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
testLatestDeps:
runs-on: ubuntu-latest
@@ -112,8 +114,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ windows-latest, ubuntu-latest ]
- suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
+ os:
+ - windows-latest
+ - ubuntu-latest
+ smoke-test-suite:
+ - glassfish
+ - jetty
+ - liberty
+ - tomcat
+ - tomee
+ - wildfly
+ - other
fail-fast: false
steps:
- name: Support longpaths
@@ -145,7 +156,7 @@ jobs:
env:
S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
- run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.suite }}
+ run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}
example-distro:
runs-on: ubuntu-latest

MODIFY
.github/workflows/patch-release-build.yml
.github/workflows/patch-release-build.yml
@@ -52,7 +52,10 @@ jobs:
needs: prepare-release-branch
strategy:
matrix:
- java: [ 8, 11, 15 ]
+ test-java-version:
+ - 8
+ - 11
+ - 15
steps:
- uses: actions/checkout@v2.3.4
with:
@@ -60,11 +63,11 @@ jobs:
fetch-depth: 0
- id: setup-test-java
- name: Set up JDK ${{ matrix.java }} for running tests
+ name: Set up JDK ${{ matrix.test-java-version }} for running tests
uses: actions/setup-java@v2
with:
distribution: adopt
- java-version: ${{ matrix.java }}
+ java-version: ${{ matrix.test-java-version }}
- name: Set up JDK 11 for running Gradle
uses: actions/setup-java@v2
@@ -75,7 +78,7 @@ jobs:
- name: Restore cache
uses: burrunan/gradle-cache-action@v1.10
with:
- job-id: jdk${{ matrix.java }}
+ job-id: jdk${{ matrix.test-java-version }}
- name: Cache Gradle Wrapper
uses: actions/cache@v2
@@ -84,7 +87,7 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Test
- run: ./gradlew test -PtestJavaVersion=${{ matrix.java }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
+ run: ./gradlew test -PtestJavaVersion=${{ matrix.test-java-version }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
# testLatestDeps is intentionally not included in the release workflow
# because any time a new library version is released to maven central
@@ -96,8 +99,17 @@ jobs:
needs: prepare-release-branch
strategy:
matrix:
- os: [ windows-latest, ubuntu-latest ]
- suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
+ os:
+ - windows-latest
+ - ubuntu-latest
+ smoke-test-suite:
+ - glassfish
+ - jetty
+ - liberty
+ - tomcat
+ - tomee
+ - wildfly
+ - other
steps:
- name: Support longpaths
run: git config --system core.longpaths true
@@ -126,7 +138,7 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Test
- run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.suite }}
+ run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}
example-distro:
runs-on: ubuntu-latest

MODIFY
.github/workflows/pr.yml
.github/workflows/pr.yml
@@ -49,7 +49,9 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 8, 15 ]
+ test-java-version:
+ - 8
+ - 15
fail-fast: false
steps:
- uses: actions/checkout@v2.3.4
@@ -57,11 +59,11 @@ jobs:
fetch-depth: 0
- id: setup-test-java
- name: Set up JDK ${{ matrix.java }} for running tests
+ name: Set up JDK ${{ matrix.test-java-version }} for running tests
uses: actions/setup-java@v2
with:
distribution: adopt
- java-version: ${{ matrix.java }}
+ java-version: ${{ matrix.test-java-version }}
- name: Set up JDK 11 for running Gradle
uses: actions/setup-java@v2
@@ -72,7 +74,7 @@ jobs:
- name: Restore cache
uses: burrunan/gradle-cache-action@v1.10
with:
- job-id: jdk${{ matrix.java }}
+ job-id: jdk${{ matrix.test-java-version }}
- name: Cache Gradle Wrapper
uses: actions/cache@v2
@@ -84,13 +86,13 @@ jobs:
run: .github/scripts/deadlock-detector.sh
- name: Test
- run: ./gradlew test -PtestJavaVersion=${{ matrix.java }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
+ run: ./gradlew test -PtestJavaVersion=${{ matrix.test-java-version }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
- name: Upload deadlock detector artifacts
if: always()
uses: actions/upload-artifact@v2
with:
- name: deadlock-detector-test-${{ matrix.java }}
+ name: deadlock-detector-test-${{ matrix.test-java-version }}
path: /tmp/deadlock-detector-*
if-no-files-found: ignore
@@ -105,8 +107,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ windows-latest, ubuntu-latest ]
- suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
+ os:
+ - windows-latest
+ - ubuntu-latest
+ smoke-test-suite:
+ - glassfish
+ - jetty
+ - liberty
+ - tomcat
+ - tomee
+ - wildfly
+ - other
fail-fast: false
steps:
- name: Support longpaths
@@ -135,7 +146,7 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Test
- run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.suite }}
+ run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}
setup-muzzle-matrix:
runs-on: ubuntu-latest

MODIFY
.github/workflows/release-build.yml
.github/workflows/release-build.yml
@@ -12,18 +12,21 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
- java: [ 8, 11, 15 ]
+ test-java-version:
+ - 8
+ - 11
+ - 15
steps:
- uses: actions/checkout@v2.3.4
with:
fetch-depth: 0
- id: setup-test-java
- name: Set up JDK ${{ matrix.java }} for running tests
+ name: Set up JDK ${{ matrix.test-java-version }} for running tests
uses: actions/setup-java@v2
with:
distribution: adopt
- java-version: ${{ matrix.java }}
+ java-version: ${{ matrix.test-java-version }}
- name: Set up JDK 11 for running Gradle
uses: actions/setup-java@v2
@@ -34,7 +37,7 @@ jobs:
- name: Restore cache
uses: burrunan/gradle-cache-action@v1.10
with:
- job-id: jdk${{ matrix.java }}
+ job-id: jdk${{ matrix.test-java-version }}
- name: Cache Gradle Wrapper
uses: actions/cache@v2
@@ -43,7 +46,7 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Test
- run: ./gradlew test -PtestJavaVersion=${{ matrix.java }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
+ run: ./gradlew test -PtestJavaVersion=${{ matrix.test-java-version }} --stacktrace -x :smoke-tests:test -Porg.gradle.java.installations.paths=${{ steps.setup-test-java.outputs.path }} -Porg.gradle.java.installations.auto-download=false
# testLatestDeps is intentionally not included in the release workflow
# because any time a new library version is released to maven central
@@ -54,8 +57,17 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
- os: [ windows-latest, ubuntu-latest ]
- suite: [ "glassfish", "jetty", "liberty", "tomcat", "tomee", "wildfly", "other" ]
+ os:
+ - windows-latest
+ - ubuntu-latest
+ smoke-test-suite:
+ - glassfish
+ - jetty
+ - liberty
+ - tomcat
+ - tomee
+ - wildfly
+ - other
steps:
- name: Support longpaths
run: git config --system core.longpaths true
@@ -83,7 +95,7 @@ jobs:
key: ${{ runner.os }}-gradle-wrapper-cache-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}
- name: Test
- run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.suite }}
+ run: ./gradlew :smoke-tests:test -PsmokeTestSuite=${{ matrix.smoke-test-suite }}
example-distro:
runs-on: ubuntu-latest

Sync GHA matrix property names with sdk repo (#3487)