Revert parts of "Also run tests with JDK 8 when compiling with JDK 11…

… and 17"
hyperxpro · Oct 25, 2023 · 4f1d55f · 4f1d55f
1 parent fe69b9b
commit 4f1d55f
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 80 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -45,14 +45,6 @@ jobs:
           architecture: x64
       - name: Build with Maven
         run: mvn -B --show-version -ntp --file pom.xml clean package
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 8
-          architecture: x64
-      - name: Test with JDK 8
-        run: mvn -B --show-version -ntp --file pom.xml surefire:test
 
   MacOS-x86_64-Build-JDK17:
     runs-on: macos-latest
@@ -66,14 +58,6 @@ jobs:
           architecture: x64
       - name: Build with Maven
         run: mvn -B --show-version -ntp --file pom.xml clean package
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 8
-          architecture: x64
-      - name: Test with JDK 8
-        run: mvn -B --show-version -ntp --file pom.xml surefire:test
 
   Linux-x86_64-Build-JDK8:
     runs-on: ubuntu-latest
@@ -183,14 +167,12 @@ jobs:
             apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential
 
             curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh
-            jabba install 1.8.0-custom=tgz+https://corretto.aws/downloads/resources/8.352.08.1/amazon-corretto-8.352.08.1-linux-aarch64.tar.gz -o /jdk8
             jabba install 11.0.0-custom=tgz+https://corretto.aws/downloads/resources/11.0.17.8.1/amazon-corretto-11.0.17.8.1-linux-aarch64.tar.gz -o /jdk
           
           run: |
+            export JAVA_HOME="/jdk"
             chmod +x ./mvnw
-            JAVA_HOME=/jdk ./mvnw -B --show-version -ntp clean package
-            # Test with JDK 8
-            JAVA_HOME=/jdk8 ./mvnw -B --show-version -ntp surefire:test
+            ./mvnw -B --show-version -ntp clean package
 
   Linux-Aarch64-Build-JDK17:
     runs-on: ubuntu-latest
@@ -226,15 +208,13 @@ jobs:
             apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential
 
             curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh
-            jabba install 1.8.0-custom=tgz+https://corretto.aws/downloads/resources/8.352.08.1/amazon-corretto-8.352.08.1-linux-aarch64.tar.gz -o /jdk8
             jabba install 17.0.0-custom=tgz+https://corretto.aws/downloads/resources/17.0.5.8.1/amazon-corretto-17.0.5.8.1-linux-aarch64.tar.gz -o /jdk
           
           run: |
             export MAVEN_OPTS="-Djdk.lang.Process.launchMechanism=vfork"
+            export JAVA_HOME="/jdk"
             chmod +x ./mvnw
-            JAVA_HOME=/jdk ./mvnw -B --show-version -ntp clean package
-            # Test with JDK 8
-            JAVA_HOME=/jdk8 ./mvnw -B --show-version -ntp surefire:test
+            ./mvnw -B --show-version -ntp clean package
 
   Linux-ArmV7-Build-JDK8:
     runs-on: ubuntu-latest
@@ -317,14 +297,12 @@ jobs:
             apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential
 
             curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh
-            jabba install 1.8.0-custom=tgz+https://cdn.azul.com/zulu-embedded/bin/zulu8.66.0.15-ca-jdk8.0.352-linux_aarch32hf.tar.gz -o /jdk8
             jabba install 11.0.0-custom=tgz+https://cdn.azul.com/zulu-embedded/bin/zulu11.60.19-ca-jdk11.0.17-linux_aarch32hf.tar.gz -o /jdk
           
           run: |
+            export JAVA_HOME="/jdk"
             chmod +x ./mvnw
-            JAVA_HOME=/jdk ./mvnw -B --show-version -ntp clean package
-            # Test with JDK 8
-            JAVA_HOME=/jdk8 ./mvnw -B --show-version -ntp surefire:test
+            ./mvnw -B --show-version -ntp clean package
             
   Linux-s390x-Build-JDK8:
     runs-on: ubuntu-latest
@@ -400,13 +378,11 @@ jobs:
           # Install dependencies
           install: |
             apt-get update
-            apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential openjdk-8-jdk openjdk-11-jdk
+            apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential openjdk-11-jdk
 
           run: |
             chmod +x ./mvnw
-            JAVA_HOME=/usr/lib/jvm/java-11-openjdk-$(uname -m) ./mvnw -B --show-version -ntp clean package
-            # Test with JDK 8
-            JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(uname -m) ./mvnw -B --show-version -ntp surefire:test
+            ./mvnw -B --show-version -ntp clean package
 
   Linux-riscv64-Build-JDK11:
     runs-on: ubuntu-latest
@@ -465,15 +441,15 @@ jobs:
           # Install dependencies
           install: |
             apt-get update
-            apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential openjdk-8-jdk openjdk-11-jdk
+            apt-get install -q -y curl gnupg2 autoconf automake libtool make tar git cmake build-essential openjdk-8-jdk
 
           run: |
             export MAVEN_OPTS="-Djdk.lang.Process.launchMechanism=vfork"
             chmod +x ./mvnw
             # Build native-linux-aarch64 only
-            JAVA_HOME=/usr/lib/jvm/java-11-openjdk-arm64 ./mvnw -B --show-version -ntp clean package -pl :native-linux-aarch64 -DskipTests
+            ./mvnw -B --show-version -ntp clean package -pl :native-linux-aarch64 -DskipTests
             # Test with JDK 8
-            JAVA_HOME=/usr/lib/jvm/java-8-openjdk-arm64 ./mvnw -B --show-version -ntp surefire:test
+            ./mvnw -B --show-version -ntp surefire:test
 
       # RISC-V doesn't upload the JDK 8 build because JDK 8 doesn't exist on RISC-V. Instead, we upload
       # the JDK 11 build. It should work on JDK 8 as well, as we are testing it on all other platforms.
@@ -596,14 +572,6 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1.12.0
       - name: Build with Maven
         run: mvn -B --show-version -ntp --file pom.xml clean package
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 8
-          architecture: x64
-      - name: Test with JDK 8
-        run: mvn -B --show-version -ntp --file pom.xml surefire:test
 
   Windows-x86_64-Build-JDK17:
     runs-on: windows-latest
@@ -619,11 +587,3 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1.12.0
       - name: Build with Maven
         run: mvn -B --show-version -ntp --file pom.xml clean package
-      - name: Set up JDK 8
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: 8
-          architecture: x64
-      - name: Test with JDK 8
-        run: mvn -B --show-version -ntp --file pom.xml surefire:test
diff --git a/docker/Dockerfile11.centos6 b/docker/Dockerfile11.centos6
@@ -4,14 +4,7 @@ RUN rm -vf /usr/lib64/libstdc++.so.6.0.24-gdb.py
 
 RUN yum -y install \
             git 
-
-RUN export java8_version=amazon-corretto@1.8.292-10.1 && \
-    export JAVA8_VERSION=$java8_version && \
-    curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | JABBA_COMMAND="install $JAVA8_VERSION -o /jdk8" bash && \
-    echo 'export JAVA8_HOME="/jdk8"' >> ~/.bashrc
-
-ENV JAVA8_HOME "/jdk8"
-
+
 RUN export java_version=amazon-corretto@1.11.0-11.9.1 && \
     export JAVA_VERSION=$java_version && \
     curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | JABBA_COMMAND="install $JAVA_VERSION -o /jdk" bash && \

diff --git a/docker/Dockerfile17.centos6 b/docker/Dockerfile17.centos6
@@ -5,13 +5,6 @@ RUN rm -vf /usr/lib64/libstdc++.so.6.0.24-gdb.py
 RUN yum -y install \
             git 
 
-RUN export java8_version=amazon-corretto@1.8.292-10.1 && \
-    export JAVA8_VERSION=$java8_version && \
-    curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | JABBA_COMMAND="install $JAVA8_VERSION -o /jdk8" bash && \
-    echo 'export JAVA8_HOME="/jdk8"' >> ~/.bashrc
-
-ENV JAVA8_HOME "/jdk8"
-
 RUN export java_version=amazon-corretto@1.17.0-0.35.1 && \
     export JAVA_VERSION=$java_version && \
     curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | JABBA_COMMAND="install $JAVA_VERSION -o /jdk" bash && \

diff --git a/docker/docker-compose11.yml b/docker/docker-compose11.yml
@@ -18,13 +18,7 @@ services:
 
   build:
     <<: *common
-    command:
-      - /bin/bash
-      - -cl
-      - |
-        JAVA_HOME=/jdk  mvn -B --show-version -ntp --file pom.xml clean package
-        # Test with JDK 8
-        JAVA_HOME=/jdk8 mvn -B --show-version -ntp --file pom.xml surefire:test
+    command: /bin/bash -cl "mvn -B --show-version -ntp --file pom.xml clean package"
 
   shell:
     <<: *common

diff --git a/docker/docker-compose17.yml b/docker/docker-compose17.yml
@@ -18,13 +18,7 @@ services:
 
   build:
     <<: *common
-    command:
-      - /bin/bash
-      - -cl
-      - |
-        JAVA_HOME=/jdk  mvn -B --show-version -ntp --file pom.xml clean package
-        # Test with JDK 8
-        JAVA_HOME=/jdk8 mvn -B --show-version -ntp --file pom.xml surefire:test
+    command: /bin/bash -cl "mvn -B --show-version -ntp --file pom.xml clean package"
 
   shell:
     <<: *common