From c72dace410326d680f1ebc5edcd7e50c6faf0b5a Mon Sep 17 00:00:00 2001 From: mislayming <18808893@qq.com> Date: Tue, 10 Dec 2024 22:46:45 +0800 Subject: [PATCH] Update centos-ci.yml Simplify CentOS CI Configuration by using actions/setup-java for JDK management -- Take one's shot --- .github/workflows/centos-ci.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/.github/workflows/centos-ci.yml b/.github/workflows/centos-ci.yml index c08685695..e58373c9d 100644 --- a/.github/workflows/centos-ci.yml +++ b/.github/workflows/centos-ci.yml @@ -20,6 +20,12 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Set up JDK ${{ matrix.java-version }} + uses: actions/setup-java@v2 + with: + java-version: ${{ matrix.java-version }} + distribution: 'adopt' + - name: Reset DNF repositories run: | cd /etc/yum.repos.d/ @@ -29,21 +35,11 @@ jobs: - name: Update DNF package index run: dnf makecache - - name: Install Java and Maven with retry + - name: Install Maven with retry run: | - if [ ${{ matrix.java-version }} -eq 8 ]; then - for i in {1..5}; do - dnf install -y java-1.8.0-openjdk-devel maven && break || sleep 15 - done - elif [ ${{ matrix.java-version }} -eq 11 ]; then - for i in {1..5}; do - dnf install -y java-11-openjdk-devel maven && break || sleep 15 - done - elif [ ${{ matrix.java-version }} -eq 21 ]; then - for i in {1..5}; do - dnf install -y java-21-openjdk-devel maven && break || sleep 15 - done - fi + for i in {1..5}; do + dnf install -y maven && break || sleep 15 + done - name: Verify Java and Maven installation run: | @@ -61,4 +57,5 @@ jobs: run: mvn -B package --file pom.xml - name: Test with Maven - run: mvn test \ No newline at end of file + run: mvn test +