[ci] Use variables and add eclipse I build tests

Rawi01 · Jan 15, 2024 · fd55c7a · fd55c7a
1 parent 1342aa8
commit fd55c7a
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
@@ -40,6 +40,8 @@ jobs:
   test-javac:
     runs-on: ubuntu-latest
     needs: build
+    env:
+      EA_JDK: 22
     strategy: 
       matrix: 
         jdk: [11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22]
@@ -56,26 +58,28 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up JDK ${{ matrix.jdk }}
-        if: ${{ matrix.jdk < 21 }}
+        if: ${{ matrix.jdk < env.EA_JDK }}
         uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.jdk }}
           distribution: 'zulu'
 
-      - name: Set up JDK 21 and up including Early Access releases
-        if: ${{ matrix.jdk >= 21 }}
+      - name: Set up JDK ${{ matrix.jdk }} Early Access release
+        if: ${{ matrix.jdk >= env.EA_JDK }}
         uses: oracle-actions/setup-java@v1
         with:
           website: jdk.java.net
           release: ${{ matrix.jdk }}
           version: latest
 
       - name: Install Ant
+        env:
+          ANT_VERSION: 1.10.14
         run: |
-          wget https://archive.apache.org/dist/ant/binaries/apache-ant-1.10.13-bin.zip
-          unzip apache-ant-1.10.13-bin.zip -d "${HOME}"
-          echo "ANT_HOME=${HOME}/apache-ant-1.10.13" >> $GITHUB_ENV
-          echo "${HOME}/apache-ant-1.10.13/bin" >> $GITHUB_PATH
+          wget https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.zip
+          unzip apache-ant-$ANT_VERSION-bin.zip -d "${HOME}"
+          echo "ANT_HOME=${HOME}/apache-ant-$ANT_VERSION" >> $GITHUB_ENV
+          echo "${HOME}/apache-ant-$ANT_VERSION/bin" >> $GITHUB_PATH
       
       - name: Cache dependencies
         uses: actions/cache@v3
@@ -102,10 +106,12 @@ jobs:
         - eclipse-202212
         - eclipse-202309
         - eclipse-202312
+        - eclipse-I-build
         - eclipse-oxygen-full
         - eclipse-2022-03-full
         - eclipse-2023-09-full
         - eclipse-2023-12-full
+        - eclipse-I-build-full
         - ecj11
         - ecj14
         - ecj16