Skip to content

Commit

Permalink
Merge pull request #3787 from Rawi01/ci-ant-cache
Browse files Browse the repository at this point in the history
[ci] Switch to Ubuntu 24.04 (ships with ant 1.10.14)
  • Loading branch information
Rawi01 authored Nov 23, 2024
2 parents 8ae385c + 6dc461a commit 9f5de53
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions .github/workflows/ant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:
- name: Checkout
Expand Down Expand Up @@ -38,7 +38,7 @@ jobs:


test-javac:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: build
env:
EA_JDK: 23
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 9f5de53

Please sign in to comment.