From 6dc461a13aae607780a3ef3dfd68dda7c8abb1b2 Mon Sep 17 00:00:00 2001
From: Rawi01 <Rawi01@users.noreply.github.com>
Date: Sat, 23 Nov 2024 13:23:01 +0100
Subject: [PATCH] [ci] Switch to Ubuntu 24.04 (ships with ant 1.10.14)

---
 .github/workflows/ant.yml | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ant.yml b/.github/workflows/ant.yml
index 26fe5426a..a216ebba6 100644
--- a/.github/workflows/ant.yml
+++ b/.github/workflows/ant.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
@@ -38,7 +38,7 @@ jobs:
     
   
   test-javac:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     env:
       EA_JDK: 23
@@ -71,15 +71,6 @@ jobs:
           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-$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@v4
@@ -95,7 +86,7 @@ jobs:
         run: ant -noinput test.${{ matrix.goal }}
   
   test-eclipse:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     strategy: 
       matrix: 
@@ -164,7 +155,7 @@ jobs:
         run: xvfb-run ant -noinput dist test.${{ matrix.version }}
         
   docker-integration-test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: build
     strategy: 
       matrix: