From 9faab949ccbe5ac8966597c37cc5c57a5e8236b1 Mon Sep 17 00:00:00 2001
From: Arpit Mohan <mohanarpit@users.noreply.github.com>
Date: Thu, 23 May 2024 19:47:34 +0530
Subject: [PATCH] ci: Making minor improvements to the CI workflow files
 (#33636)

This is trivial housekeeping task to keep the workflow files consistent
and remove warnings.
---
 .github/workflows/ci-test-limited.yml         | 2 +-
 .github/workflows/client-lint.yml             | 2 --
 .github/workflows/client-prettier.yml         | 3 +--
 .github/workflows/pr-cypress.yml              | 2 +-
 .github/workflows/test-build-docker-image.yml | 9 +++++----
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml
index 703b9a4c4a6..4ff8130868b 100644
--- a/.github/workflows/ci-test-limited.yml
+++ b/.github/workflows/ci-test-limited.yml
@@ -96,7 +96,7 @@ jobs:
       # In case this is second attempt try restoring status of the prior attempt from cache
       - name: Restore the previous run result
         id: cache-appsmith
-        uses: martijnhols/actions-cache@v3.0.2
+        uses: actions/cache/restore@v4
         with:
           path: |
             ~/run_result
diff --git a/.github/workflows/client-lint.yml b/.github/workflows/client-lint.yml
index 37bd14cf7dd..d546e5dd585 100644
--- a/.github/workflows/client-lint.yml
+++ b/.github/workflows/client-lint.yml
@@ -90,8 +90,6 @@ jobs:
         with:
           path: app/client/.yarn/cache
           key: v1-yarn3-${{ hashFiles('app/client/yarn.lock') }}
-          restore-keys: |
-            v1-yarn3-
 
       # Set status = success
       - name: Save the status of the run
diff --git a/.github/workflows/client-prettier.yml b/.github/workflows/client-prettier.yml
index 771ea6bab5a..893aa1812fc 100644
--- a/.github/workflows/client-prettier.yml
+++ b/.github/workflows/client-prettier.yml
@@ -56,7 +56,7 @@ jobs:
       # Restoring the cache manually instead
       - name: Restore Yarn cache
         if: steps.run_result.outputs.run_result != 'success'
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         with:
           path: app/client/.yarn/cache
           key: v1-yarn3-${{ hashFiles('app/client/yarn.lock') }}
@@ -78,4 +78,3 @@ jobs:
         with:
           path: app/client/.yarn/cache
           key: v1-yarn3-${{ hashFiles('app/client/yarn.lock') }}
-          restore-keys: v1-yarn3-
diff --git a/.github/workflows/pr-cypress.yml b/.github/workflows/pr-cypress.yml
index 5148ca6ca3b..fa092902d85 100644
--- a/.github/workflows/pr-cypress.yml
+++ b/.github/workflows/pr-cypress.yml
@@ -156,7 +156,7 @@ jobs:
           path: ~/combined_failed_spec_ci
           overwrite: true
 
-      - name: Get Latest flaky Tests
+      - name: Get latest flaky tests
         shell: bash
         run: |
           curl --request POST --url https://yatin-s-workspace-jk8ru5.us-east-1.xata.sh/db/CypressKnownFailures:main/tables/CypressKnownFailuires/query --header 'Authorization: Bearer ${{ secrets.XATA_TOKEN }}' --header 'Content-Type: application/json'|jq -r |grep Spec|cut -d ':' -f 2 2> /dev/null|sed 's/"//g'|sed 's/,//g' >  ~/knownfailures
diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml
index 782b9c02efe..0f8afa6cb59 100644
--- a/.github/workflows/test-build-docker-image.yml
+++ b/.github/workflows/test-build-docker-image.yml
@@ -153,7 +153,8 @@ jobs:
           rm -f ~/combined_failed_spec_ci
 
       # Download failed_spec_ci list for all CI container jobs
-      - uses: actions/download-artifact@v4
+      - name: Download failed_spec_ci list for all CI container jobs
+        uses: actions/download-artifact@v4
         if: needs.ci-test.result != 'success'
         id: download_ci
         with:
@@ -161,7 +162,7 @@ jobs:
           path: ~/failed_spec_ci
 
       # In case for any ci job failure, create combined failed spec
-      - name: "combine all specs for CI"
+      - name: Combine all specs for CI
         if: needs.ci-test.result != 'success'
         run: |
           rm -f ~/combined_failed_spec_ci
@@ -200,7 +201,7 @@ jobs:
             echo "slack_icon=:warning:" >> $GITHUB_OUTPUT
           fi
 
-      - name: Slack Notification
+      - name: Slack notification
         continue-on-error: true
         if: always()
         uses: rtCamp/action-slack-notify@v2
@@ -253,7 +254,7 @@ jobs:
 
       # Upload combined failed CI spec list to a file
       # This is done for debugging.
-      - name: upload combined failed spec
+      - name: Upload combined failed spec
         if: needs.ci-test.result != 'success'
         uses: actions/upload-artifact@v4
         with: