Simplify github-actions build.

Signed-off-by: Sjoerd Talsma <sjoerdtalsma@users.noreply.github.com>
talsma-ict · Oct 12, 2024 · 183fe44 · 183fe44
1 parent dde1af5
commit 183fe44
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 56 deletions.
diff --git a/.github/mvn-toolchains.xml b/.github/mvn-toolchains.xml
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup GPG
@@ -25,35 +25,24 @@ jobs:
         env:
           GPG_SECRET_KEYS: ${{ secrets.GPG_SECRET_KEYS }}
           GPG_OWNERTRUST: ${{ secrets.GPG_OWNERTRUST }}
-      - name: Setup Graphviz
-        run: sudo apt-get install graphviz
-      - name: Set up JDK 8 for compiling Java 8 compatible bytecode
-        id: setup-java-8
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 8
-          java-package: jdk
-      - name: Set up JDK 11 to support jigsaw module system
-        id: setup-java-11
-        uses: actions/setup-java@v3
+      - name: Set up Java
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 11
-          java-package: jdk
-      - name: Setup maven cache
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-m2-repo-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2-repo-
+          java-version: |
+            8
+            21
+          mvn-toolchain-id: |
+            jdk8
+            jdk21
+          cache: 'maven'
       - name: Perform build
         run: .github/scripts/build.sh
         shell: bash
         env:
           JAVA_8_HOME: ${{ steps.setup-java-8.outputs.path }}
           JAVA_11_HOME: ${{ steps.setup-java-11.outputs.path }}
-          MAVEN_CLI_OPTS: --settings .github/mvn-settings.xml --global-toolchains .github/mvn-toolchains.xml
+          MAVEN_CLI_OPTS: --settings .github/mvn-settings.xml
           GPG_EXECUTABLE: /usr/bin/gpg
           GPG_KEYNAME: ${{ secrets.GPG_KEYNAME }}
           GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
@@ -83,20 +72,13 @@ jobs:
         run: |
           git config user.name "Talsma CI"
           git config user.email "ci-user@talsma-ict.nl"
-      - name: Set up JDK
+      - name: Set up Java
         if: env.GH_TOKEN != null
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'zulu'
-          java-version: 11
-          java-package: jdk
-      - name: Set up maven cache
-        if: env.GH_TOKEN != null
-        uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-m2-repo-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2-repo-
+          java-version: 21
+          cache: 'maven'
       - name: Perform optional release
         if: env.GH_TOKEN != null
         run: .github/scripts/release.sh