test-infra: merges github action test scripts and bumps jdk

Signed-off-by: yue9944882 <291271447@qq.com>
kubernetes-client · Nov 28, 2022 · b859f45 · b859f45
1 parent 6f04a47
commit b859f45
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 42 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -22,34 +22,12 @@ jobs:
           java-version: 8.0.x
       - name: Verify Format and License
         run: mvn spotless:check
-  legacy-build:
-    name: Legacy Java ${{ matrix.java }} Maven Test on ${{ matrix.os }}
-    strategy:
-      matrix:
-        java: [ 8.0.x, 11.0.x ]
-        os: [ macos-latest, windows-latest, ubuntu-latest ]
-    runs-on: ${{ matrix.os }}
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup Java
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-      - name: Cache local Maven repository
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ matrix.java }}-${{ hashFiles('pom.xml', '**/pom.xml') }}
-      - name: Build with Maven
-        run: |
-          mvn clean test -q -B -Pcompatibility-before-java17 --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
   build:
     name: Java ${{ matrix.java }} Maven Test on ${{ matrix.os }}
     strategy:
       matrix:
         # Test against the LTS Java versions. TODO: add JDK18 when it becomes available.
-        java: [ 17.0.x ]
+        java: [ 8.0.x, 11.0.x, 17.0.x ]
         os: [ macos-latest, windows-latest, ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     steps:
@@ -65,16 +43,23 @@ jobs:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ matrix.java }}-${{ hashFiles('pom.xml', '**/pom.xml') }}
       - name: Build with Maven
+        shell: bash
         run: |
-          mvn clean test -q -B --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+          if [ $(grep -E '^(8|11)\.' <<< '${{ matrix.java }}') ]; then
+            # some module doesn't compile on java platform lower than 17, need to skip them by specifying a profile
+            MODS_OVERRIDES='-pl !spring-aot'
+          fi
+          mvn -q -B --define=org.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn $MODS_OVERRIDES clean test
   build-graalvm:
     runs-on: ubuntu-latest
     name: GraalVM Maven Test
     steps:
       - uses: actions/checkout@v3
-      - uses: DeLaGuardo/setup-graalvm@48f2bf339ab7d35e31029b1822a213681fdfc42e
+      - uses: graalvm/setup-graalvm@v1
         with:
-          graalvm-version: '19.3.0.java8'
+          version: '22.3.0'
+          java-version: '17'
+          components: 'native-image'
       - name: Build with Maven
         run: mvn -q test -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
   e2e:
@@ -84,6 +69,11 @@ jobs:
       - uses: actions/checkout@v3
       - name: Create k8s Kind Cluster
         uses: helm/kind-action@v1.4.0
+      - name: Setup Java
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: 17.0.x
       - name: Run E2E with Maven
         run: |
           mvn clean install \

diff --git a/pom.xml b/pom.xml
@@ -563,21 +563,5 @@ limitations under the License.
         <module>fluent-gen</module>
       </modules>
     </profile>
-    <profile>
-      <id>compatibility-before-java17</id>
-      <modules>
-        <module>util</module>
-        <module>kubernetes</module>
-        <module>proto</module>
-        <module>extended</module>
-        <module>fluent</module>
-        <module>spring</module>
-        <module>e2e</module>
-        <module>examples</module>
-        <module>client-java-contrib/cert-manager</module>
-        <module>client-java-contrib/prometheus-operator</module>
-        <module>client-java-contrib/admissionreview</module>
-      </modules>
-    </profile>
   </profiles>
 </project>