Merge pull request #4917 from evolvedbinary/improve/githubactions-basic

Further improvements to GitHub Actions config

Author: reinhapa

.github/workflows/ci-deploy.yml

@@ -24,8 +24,8 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          key: deploy-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: deploy-${{ runner.os }}-maven
       - name: Install bats
         run: sudo apt-get install bats    
       - name: Build images

.github/workflows/ci-test.yml

@@ -30,38 +30,32 @@ jobs:
           cache: 'maven'
       - run: mvn -V -B dependency-check:check
         timeout-minutes: 60
-  documentation:
-    name: Javadoc
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          distribution: temurin
-          java-version: ${{ env.DEV_JDK }}
-          cache: 'maven'
-      - run: mvn -V -B -q -T 2C install javadoc:javadoc -DskipTests -D'dependency-check.skip' -D'license.skip' --projects '!exist-distribution,!exist-installer' --also-make
   test:
-    name: (JDK ${{ matrix.jdk }} / ${{ matrix.os }}) Test
+    name: ${{ matrix.os }} Test
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        jdk: [ '17' ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK ${{ matrix.jdk }}
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: ${{ matrix.jdk }}
+          java-version: ${{ env.DEV_JDK }}
           cache: 'maven'
+      - name: Maven Build
+        timeout-minutes: 10
+        run: mvn -V -B -T 1C compile test-compile -DtrimStackTrace=false -D'dependency-check.skip' -D'license.skip'
       - name: Maven Test
         timeout-minutes: 60
-        run: mvn -V -B verify -D'dependency-check.skip' -D'license.skip'
-      - name: Maven Code Coverage
-        if: ${{ github.ref == 'refs/heads/develop' && matrix.jdk == env.DEV_JDK && matrix.os == 'ubuntu-latest' }}
+        run: mvn -V -B verify -DtrimStackTrace=false -D'dependency-check.skip' -D'license.skip'
+      - name: Javadoc (Linux only)
+        if: ${{ matrix.os == 'ubuntu-latest' }}
+        run: mvn -V -B -q -T 1C install javadoc:javadoc -DskipTests -D'dependency-check.skip' -D'license.skip' --projects '!exist-distribution,!exist-installer' --also-make
+      - name: Maven Code Coverage (Develop branch on Linux only)
+        if: ${{ github.ref == 'refs/heads/develop' && matrix.os == 'ubuntu-latest' }}
         env:
           CI_NAME: github
           BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
@@ -73,7 +67,7 @@ jobs:
         if: always()
         uses: actions/upload-artifact@v3
         with:
-          name: ${{ runner.os }}-jdk${{ matrix.jdk }}-build-logs
+          name: ${{ runner.os }}-build-logs
           retention-days: 5
           path: |
             **/*.jfr

.github/workflows/ci-xqts.yml

@@ -14,7 +14,12 @@ jobs:
         with:
           distribution: temurin
           java-version: '17'
-          cache: 'maven'
+      - name: Cache Maven packages
+        uses: actions/cache@v3
+        with:
+          path: ~/.m2
+          key: xqts-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: xqts-${{ runner.os }}-maven
       - name: Maven XQTS Build
         run: mvn -V -B clean package -DskipTests -Ddependency-check.skip=true --projects exist-xqts --also-make
       - name: Run XQTS

.github/workflows/sonarcloud.yml

@@ -23,14 +23,14 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
+          key: sonarcloud-${{ runner.os }}-cache-${{ hashFiles('**/pom.xml') }}
+          restore-keys: sonarcloud-${{ runner.os }}-cache
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
           path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          key: sonarcloud-${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: sonarcloud-${{ runner.os }}-maven
       - name: Analyze
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any