Merge pull request #2683 from hazendaz/master

[gha] add cache throughout / change name on coveralls from build to c…
Waffle · Jan 2, 2025 · 8a517a9 · 8a517a9
2 parents 92be5bf + 311ccdd
commit 8a517a9
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -11,9 +11,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-2019, windows-latest]
-        java: [21, 23, 24-ea, 25-ea]
+        cache: [maven]
         distribution: ['temurin']
+        java: [21, 23, 24-ea, 25-ea]
+        os: [windows-2019, windows-latest]
       fail-fast: false
       max-parallel: 4
     name: Test JDK ${{ matrix.java }}, ${{ matrix.os }}
@@ -23,7 +24,8 @@ jobs:
       - name: Set up JDK ${{ matrix.java }} ${{ matrix.distribution }}
         uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          cache: ${{ matrix.cache }}
           distribution: ${{ matrix.distribution }}
+          java-version: ${{ matrix.java }}
       - name: Test with Maven
         run: ./mvnw test -B -V --no-transfer-progress -D"license.skip=true" -D"net.bytebuddy.experimental=true"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -26,9 +26,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
+          cache: maven
           java-version: 21
           distribution: 'zulu'
 

diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -23,16 +23,17 @@ defaults:
 on: [push, pull_request]
 
 jobs:
-  build:
+  coveralls:
     if: github.repository_owner == 'waffle'
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          cache: maven
           distribution: zulu
+          java-version: 21
       - name: Report Coverage to Coveralls for Pull Requests
         if: github.event_name == 'pull_request'
         run: ./mvnw -B -V test jacoco:report coveralls:report -q -D"license.skip=true" -DrepoToken=$GITHUB_TOKEN -DserviceName=github -DpullRequest=$PR_NUMBER --no-transfer-progress -Pcoveralls

diff --git a/.github/workflows/coverity.yaml b/.github/workflows/coverity.yaml
@@ -11,16 +11,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
+          cache: maven
           java-version: 21
           distribution: zulu
       - name: Analyze with Coverity
         run: |
           wget -q https://scan.coverity.com/download/linux64 --post-data "token=$COVERITY_TOKEN&project=Waffle%2Fwaffle" -O coverity_tool.tgz
           tar -xf coverity_tool.tgz
-          ./cov-analysis-linux64-*/bin/cov-build --dir cov-int ./mvnw -B -DskipTests=true -D"license.skip=true" verify
+          ./cov-analysis-linux64-*/bin/cov-build --dir cov-int ./mvnw -B -V -DskipTests=true --no-transfer-progress -D"license.skip=true" verify
           tar czvf waffle.tgz cov-int
           curl --form token=$COVERITY_TOKEN \
             --form email=$EMAIL \

diff --git a/.github/workflows/site.yaml b/.github/workflows/site.yaml
@@ -15,9 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
+          cache: maven
           distribution: zulu
           java-version: 21
       - name: Build site

diff --git a/.github/workflows/sonar.yaml b/.github/workflows/sonar.yaml
@@ -18,11 +18,12 @@ jobs:
         with:
           # Disabling shallow clone is recommended for improving relevancy of reporting
           fetch-depth: 0
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
-          java-version: 21
+          cache: maven
           distribution: zulu
+          java-version: 21
       - name: Analyze with SonarCloud
         run: ./mvnw verify jacoco:report sonar:sonar -B -V -D"sonar.projectKey=Waffle_waffle" -D"sonar.organization=waffle" -D"sonar.host.url=https://sonarcloud.io" -D"sonar.token=$SONAR_TOKEN" -D"license.skip=true" --no-transfer-progress -D"sonar.scanner.skipJreProvisioning=true"
         env:

diff --git a/.github/workflows/sonatype.yaml b/.github/workflows/sonatype.yaml
@@ -15,9 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK
+      - name: Setup Java
         uses: actions/setup-java@v4
         with:
+          cache: maven
           java-version: 21
           distribution: zulu
       - name: Deploy to Sonatype