From 86c0b2ad25bb80583655b4ca54ab928192c20c17 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Thu, 14 Mar 2024 13:11:25 +0000
Subject: [PATCH] Modify ci workflows

- Due to changes in gradle build
- Relates #1143
---
 .github/workflows/ci.yml      | 16 ++++++++++------
 .github/workflows/mongodb.yml | 10 ++++++----
 .github/workflows/redis.yml   | 10 ++++++----
 .github/workflows/smoke.yml   | 10 ++++++----
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 180db50d..5ed06953 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,11 +20,13 @@ jobs:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: adopt
         java-version: ${{ matrix.java }}
+        cache: gradle
     - name: Build with Gradle
       run: ./gradlew clean build
       env:
@@ -53,13 +55,15 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v1
+    - uses: actions/checkout@v4
+    - uses: actions/setup-java@v4
       with:
+        distribution: adopt
         java-version: 17
-    - uses: jfrog/setup-jfrog-cli@v3
+        cache: gradle
+    - uses: jfrog/setup-jfrog-cli@v4
       with:
-        version: 2.39.1
+        version: 2.52.10
       env:
         JF_ENV_SPRING: ${{ secrets.JF_ARTIFACTORY_SPRING }}
 
diff --git a/.github/workflows/mongodb.yml b/.github/workflows/mongodb.yml
index 88377678..10813489 100644
--- a/.github/workflows/mongodb.yml
+++ b/.github/workflows/mongodb.yml
@@ -28,13 +28,15 @@ jobs:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: adopt
         java-version: ${{ matrix.java }}
+        cache: gradle
     - name: Build with Gradle
-      run: ./gradlew clean build -x docsZip -x distZip -PstatemachineIncludeTags=mongodb -PstatemachineTestResults=true
+      run: ./gradlew clean build -PstatemachineIncludeTags=mongodb -PstatemachineTestResults=true
     - name: Tar Build Logs
       if: ${{ failure() }}
       run: |
@@ -42,7 +44,7 @@ jobs:
         tar -zc --ignore-failed-read --file build/buildlogs.tar.gz */build/reports */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz
diff --git a/.github/workflows/redis.yml b/.github/workflows/redis.yml
index ca46b913..8e17a844 100644
--- a/.github/workflows/redis.yml
+++ b/.github/workflows/redis.yml
@@ -28,13 +28,15 @@ jobs:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: adopt
         java-version: ${{ matrix.java }}
+        cache: gradle
     - name: Build with Gradle
-      run: ./gradlew clean build -x docsZip -x distZip -PstatemachineIncludeTags=redis -PstatemachineTestResults=true
+      run: ./gradlew clean build -PstatemachineIncludeTags=redis -PstatemachineTestResults=true
     - name: Tar Build Logs
       if: ${{ failure() }}
       run: |
@@ -42,7 +44,7 @@ jobs:
         tar -zc --ignore-failed-read --file build/buildlogs.tar.gz */build/reports */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz
diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 46b6f965..89fd56ed 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -22,13 +22,15 @@ jobs:
       fail-fast: false
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup JDK
-      uses: actions/setup-java@v1
+      uses: actions/setup-java@v4
       with:
+        distribution: adopt
         java-version: ${{ matrix.java }}
+        cache: gradle
     - name: Build with Gradle
-      run: ./gradlew clean build -x docsZip -x distZip -PstatemachineIncludeTags=smoke -PstatemachineTestResults=true
+      run: ./gradlew clean build -PstatemachineIncludeTags=smoke -PstatemachineTestResults=true
     - name: Tar Build Logs
       if: ${{ failure() }}
       run: |
@@ -36,7 +38,7 @@ jobs:
         tar -zc --ignore-failed-read --file build/buildlogs.tar.gz */build/reports */*/build/reports
     - name: Upload Build Logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: buildlogs
         path: build/buildlogs.tar.gz