Merge pull request #106 from sbesson/gradle_workflow_fixes

CI workflow fixes (Gradle, outdated actions)
ome · Mar 7, 2023 · a045d97 · a045d97
2 parents 2f0f734 + ceeafdc
commit a045d97
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 25 deletions.
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -11,29 +11,22 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [1.8, 11]
+        java: [8, 11, 17]
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     env:
-      gradle_version:  # set to empty to build with most recent version of gradle
+      gradle_version: 7.6 # set to empty to build with most recent version of gradle
       gradle_commands: publishToMavenLocal exec # default is build
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-      - name: Cache Gradle packages
-        uses: actions/cache@v2
+          distribution: 'zulu'
+          cache: 'gradle'
+      - uses: gradle/gradle-build-action@v2
         with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-      - name: Wrap with specified version
-        run: gradle wrapper --gradle-version=${{ env.gradle_version }}
-        if: ${{ env.gradle_version != '' }}
-      - name: Wrap without version
-        run: gradle wrapper
-        if: ${{ env.gradle_version == '' }}
+          gradle-version: ${{ env.gradle_version }}
       - name: Run commands
-        run: ./gradlew ${{ env.gradle_commands }}
+        run: gradle ${{ env.gradle_commands }}
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -13,23 +13,19 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [1.8, 11]
+        java: [8, 11, 17]
         os: [ubuntu-latest, windows-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     env:
       maven_commands: install # default is install
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
           java-version: ${{ matrix.java }}
-      - name: Cache Maven packages
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          distribution: 'zulu'
+          cache: 'maven'
       - name: Build
         run: mvn ${{ env.maven_commands }}
   deploy: