From ae0616bb43203069ea857713c4cd6c77ea78a593 Mon Sep 17 00:00:00 2001
From: Michael Burman <yak@iki.fi>
Date: Wed, 10 Apr 2024 16:46:30 +0300
Subject: [PATCH] Update github actions

---
 .github/workflows/buildAndDeploy.yml | 17 +++--------------
 .github/workflows/release.yml        | 15 +++++++++------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/buildAndDeploy.yml b/.github/workflows/buildAndDeploy.yml
index b433d52..b958b85 100644
--- a/.github/workflows/buildAndDeploy.yml
+++ b/.github/workflows/buildAndDeploy.yml
@@ -30,9 +30,9 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache
         with:
           path: /tmp/.buildx-cache
@@ -44,17 +44,6 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
       - name: Build with Gradle
         run: ./gradlew test
-
-      # - name: Run tests
-      #   if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'datastax/cass-config-builder'
-      #   env:
-      #     ORG_GRADLE_PROJECT_dockerRegistry: docker.pkg.github.com
-      #     ORG_GRADLE_PROJECT_dockerRegistryUsername: ${{ github.actor }}
-      #     ORG_GRADLE_PROJECT_dockerRegistryPassword: ${{ secrets.GITHUB_TOKEN }}
-      #   uses: eskatos/gradle-command-action@v1
-      #   with:
-      #     gradle-version: 6.0.1
-      #     arguments: test
       - name: Build docker image
         env:
           GITHUB_REPO_OWNER: ${{ github.repository_owner }}
@@ -63,7 +52,7 @@ jobs:
           ./scripts/build-push-images.sh
       - name: Archive build logs
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: gradle-logs
           path: build/reports
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b2e333f..ddfdc87 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,16 +10,19 @@ jobs:
     name: Release Cass Config Builder
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           submodules: true
       - name: Login to DockerHub
-        run: echo "${{ secrets.DOCKERHUB_PASS }}" | docker login -u "${{ secrets.DOCKERHUB_USER }}" --password-stdin
-      - name: Setup Buildx
-        id: buildx
-        uses: crazy-max/ghaction-docker-buildx@v3
+        if: ${{ !env.ACT }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USER }}
+          password: ${{ secrets.DOCKERHUB_PASS }}
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
       - name: Cache Docker layers
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         id: cache
         with:
           path: /tmp/.buildx-cache