From de7e770dfaeb197437b2cd7ce1c6abafd2f7f011 Mon Sep 17 00:00:00 2001
From: Christopher Tubbs <ctubbsii@apache.org>
Date: Tue, 26 Nov 2024 15:38:02 -0500
Subject: [PATCH] [CI] (Trivial) Update GitHub Actions

Reviewers: anmolnar
Author: ctubbsii
Closes #2216 from ctubbsii/update-ga-v4

(cherry picked from commit aba99cfa323757d14893eb1a7d813c5fbdec7500)
Signed-off-by: Andor Molnar <andor@apache.org>
---
 .github/workflows/ci.yaml     | 19 ++++++-------------
 .github/workflows/e2e.yaml    | 13 +++----------
 .github/workflows/manual.yaml | 17 +++++------------
 3 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c1363bd8a57..9704d76e788 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -48,20 +48,13 @@ jobs:
     timeout-minutes: 360
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK ${{ matrix.profile.jdk }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: ${{ matrix.profile.jdk }}
         distribution: temurin
-    - name: Cache local maven repository
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/zookeeper
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Install C Dependencies
@@ -74,21 +67,21 @@ jobs:
         MAVEN_OPTS: -Djansi.force=true
     - name: Upload unit test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: surefire-reports-${{ matrix.profile.name }}
         path: ./**/target/surefire-reports/
         if-no-files-found: ignore
     - name: Upload integration test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: failsafe-reports-${{ matrix.profile.name }}
         path: ./**/target/failsafe-reports/
         if-no-files-found: ignore
     - name: Upload cppunit test logs
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: cppunit-logs-${{ matrix.profile.name }}
         path: ./zookeeper-client/zookeeper-client-c/target/c/TEST-*.txt
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index e497c3f0396..b47c300d43e 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -31,20 +31,13 @@ jobs:
     timeout-minutes: 360
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.jdk }}
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.jdk }}
           distribution: temurin
-      - name: Cache local maven repository
-        uses: actions/cache@v3
-        with:
-          path: |
-            ~/.m2/repository/
-            !~/.m2/repository/org/apache/zookeeper
-          key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-m2
+          cache: 'maven'
       - name: Show the first log message
         run: git log -n1
       - name: Install C Dependencies
diff --git a/.github/workflows/manual.yaml b/.github/workflows/manual.yaml
index 905ba49f33d..898fd283b9c 100644
--- a/.github/workflows/manual.yaml
+++ b/.github/workflows/manual.yaml
@@ -43,22 +43,15 @@ jobs:
     timeout-minutes: 360
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         ref: ${{ github.event.inputs.buildRef }}
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: 11
         distribution: temurin
-    - name: Cache local maven repository
-      uses: actions/cache@v3
-      with:
-        path: |
-          ~/.m2/repository/
-          !~/.m2/repository/org/apache/zookeeper
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        cache: 'maven'
     - name: Show the first log message
       run: git log -n1
     - name: Install C Dependencies
@@ -71,14 +64,14 @@ jobs:
         MAVEN_OPTS: -Djansi.force=true
     - name: Upload unit test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: surefire-reports
         path: ./**/target/surefire-reports/
         if-no-files-found: ignore
     - name: Upload integration test results
       if: ${{ failure() }}
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: failsafe-reports
         path: ./**/target/failsafe-reports/