Merge pull request #695 from smallrye/ci-temurin

Use Eclipse Temurin + 8/11/17 matrix
smallrye · Sep 23, 2021 · cbfbfcf · cbfbfcf
2 parents 639ef12 + a73fc77
commit cbfbfcf
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -16,8 +16,7 @@ jobs:
  java: [
  { 'version': '8', opts: '' },
  { 'version': '11', opts: '' },
- { 'version': '16', 'opts': '--illegal-access=permit' }, # required for kotlin on java 16
- { 'version': '17-ea', 'opts': '--illegal-access=permit' } # required for kotlin on java 17
+ { 'version': '17', 'opts': '' }
  ]
  name: Build with Java ${{ matrix.java.version }} (OpenJDK)
  steps:
@@ -29,7 +28,7 @@ jobs:
  - uses: actions/setup-java@v2
  name: set up jdk ${{matrix.java.version}}
  with:
- distribution: adopt
+ distribution: temurin
  java-version: ${{matrix.java.version}}
  - name: Build with Maven
  env:
@@ -48,7 +47,7 @@ jobs:
  - uses: actions/setup-java@v2
  with:
  java-version: 11
- distribution: adopt
+ distribution: temurin
  - name: Deploy snapshots
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -69,7 +68,7 @@ jobs:
  - uses: actions/setup-java@v2
  with:
  java-version: 11
- distribution: adopt
+ distribution: temurin
  - name: Coverage and Sonar
  env:
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -98,6 +97,6 @@ jobs:
  - uses: actions/setup-java@v2
  with:
  java-version: 11
- distribution: adopt
+ distribution: temurin
  - name: Compatibility Check
  run: mvn -s .build/maven-ci-settings.xml -pl '!bom' -B install revapi:check@check-compatibility -DskipTests -fae
diff --git a/.github/workflows/build-pull.yml b/.github/workflows/build-pull.yml
@@ -9,10 +9,9 @@ jobs:
  strategy:
  matrix:
  java: [
- { 'version': '8', 'source': 'releases', opts: '' },
- { 'version': '11', 'source': 'releases', opts: '' },
- { 'version': '16', 'source': 'nightly', 'opts': '--illegal-access=permit' }, # required for kotlin on java 16
- { 'version': '17-ea', 'opts': '--illegal-access=permit' } # required for kotlin on java 17
+ { 'version': '8', opts: '' },
+ { 'version': '11', opts: '' },
+ { 'version': '17', 'opts': '' }
  ]
  name: Build with Java ${{ matrix.java.version }}
  steps:
@@ -24,7 +23,7 @@ jobs:
  - uses: actions/setup-java@v2
  name: set up jdk ${{matrix.java.version}}
  with:
- distribution: adopt
+ distribution: temurin
  java-version: ${{matrix.java.version}}
  - name: Build with Maven
  env:
@@ -33,17 +32,17 @@ jobs:
  - name: Codecov
  uses: codecov/codecov-action@v1.0.13
  compatibility:
-  runs-on: ubuntu-20.04
-  name: Compatibility Check
-  steps:
-  - uses: actions/cache@v2
-  with:
-  path: ~/.m2/repository
-  key: maven-java-11
-  - uses: actions/checkout@v2
-  - uses: actions/setup-java@v2
-  with:
-  java-version: 11
-  distribution: adopt
-  - name: Compatibility Check
-  run: mvn -s .build/maven-ci-settings.xml -pl '!bom' -B install revapi:check@check-compatibility -DskipTests -fae
+ runs-on: ubuntu-20.04
+ name: Compatibility Check
+ steps:
+ - uses: actions/cache@v2
+ with:
+ path: ~/.m2/repository
+ key: maven-java-11
+ - uses: actions/checkout@v2
+ - uses: actions/setup-java@v2
+ with:
+ java-version: 11
+ distribution: temurin
+ - name: Compatibility Check
+ run: mvn -s .build/maven-ci-settings.xml -pl '!bom' -B install revapi:check@check-compatibility -DskipTests -fae
diff --git a/.github/workflows/deploy-release.yml b/.github/workflows/deploy-release.yml
@@ -24,7 +24,7 @@ jobs:
  uses: actions/setup-java@v2
  with:
  java-version: 11
- distribution: adopt
+ distribution: temurin
  - name: 'Deploy'
  env:
  GITHUB_CONTEXT: ${{ toJson(github) }}

diff --git a/.github/workflows/deploy-site.yml b/.github/workflows/deploy-site.yml
@@ -23,7 +23,7 @@ jobs:
  uses: actions/setup-java@v2
  with:
  java-version: 11
- distribution: adopt
+ distribution: temurin
  - name: 'Setup Ruby'
  uses: ruby/setup-ruby@v1
  with:

diff --git a/.github/workflows/post-release.yml b/.github/workflows/post-release.yml
@@ -23,7 +23,7 @@ jobs:
  uses: actions/setup-java@v2
  with:
  java-version: 11
- distribution: adopt
+ distribution: temurin
  - name: 'Collect Compatibility Justification'
  env:
  GITHUB_CONTEXT: ${{ toJson(github) }}

diff --git a/.github/workflows/prepare-release.yml b/.github/workflows/prepare-release.yml
@@ -39,7 +39,7 @@ jobs:
  uses: actions/setup-java@v2
  with:
  java-version: 11
- distribution: adopt
+ distribution: temurin
  - name: 'Prepare'
  env:
  GITHUB_CONTEXT: ${{ toJson(github) }}

diff --git a/kotlin/pom.xml b/kotlin/pom.xml
@@ -108,7 +108,9 @@
  <profile>
  <id>dokka</id>
  <activation>
- <activeByDefault>true</activeByDefault>
+ <!-- Dokka is currently broken -->
+ <!-- <activeByDefault>true</activeByDefault> -->
+ <jdk>[8,15)</jdk>
  </activation>
  <build>
  <plugins>