Skip to content

Commit 9f5de53

Browse files
authored
Merge pull request #3787 from Rawi01/ci-ant-cache
[ci] Switch to Ubuntu 24.04 (ships with ant 1.10.14)
2 parents 8ae385c + 6dc461a commit 9f5de53

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

.github/workflows/ant.yml

+4-13
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
build:
9-
runs-on: ubuntu-latest
9+
runs-on: ubuntu-24.04
1010

1111
steps:
1212
- name: Checkout
@@ -38,7 +38,7 @@ jobs:
3838

3939

4040
test-javac:
41-
runs-on: ubuntu-latest
41+
runs-on: ubuntu-24.04
4242
needs: build
4343
env:
4444
EA_JDK: 23
@@ -71,15 +71,6 @@ jobs:
7171
website: jdk.java.net
7272
release: ${{ matrix.jdk }}
7373
version: latest
74-
75-
- name: Install Ant
76-
env:
77-
ANT_VERSION: 1.10.14
78-
run: |
79-
wget https://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VERSION-bin.zip
80-
unzip apache-ant-$ANT_VERSION-bin.zip -d "${HOME}"
81-
echo "ANT_HOME=${HOME}/apache-ant-$ANT_VERSION" >> $GITHUB_ENV
82-
echo "${HOME}/apache-ant-$ANT_VERSION/bin" >> $GITHUB_PATH
8374

8475
- name: Cache dependencies
8576
uses: actions/cache@v4
@@ -95,7 +86,7 @@ jobs:
9586
run: ant -noinput test.${{ matrix.goal }}
9687

9788
test-eclipse:
98-
runs-on: ubuntu-latest
89+
runs-on: ubuntu-24.04
9990
needs: build
10091
strategy:
10192
matrix:
@@ -164,7 +155,7 @@ jobs:
164155
run: xvfb-run ant -noinput dist test.${{ matrix.version }}
165156

166157
docker-integration-test:
167-
runs-on: ubuntu-latest
158+
runs-on: ubuntu-24.04
168159
needs: build
169160
strategy:
170161
matrix:

0 commit comments

Comments
 (0)