From f5fbd098504cddb4bf6e5b7d75a718d53dee73fa Mon Sep 17 00:00:00 2001
From: Marco Carrozzo <Marco.Carrozzo@hyland.com>
Date: Thu, 19 Jan 2023 19:37:47 +0100
Subject: [PATCH] using shasum

---
 .../download-cache-and-artifacts/action.yml   | 19 +++++++++++++------
 .../upload-cache-and-artifacts/action.yml     |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.github/actions/download-cache-and-artifacts/action.yml b/.github/actions/download-cache-and-artifacts/action.yml
index 4061466d35..0cc5a88a79 100644
--- a/.github/actions/download-cache-and-artifacts/action.yml
+++ b/.github/actions/download-cache-and-artifacts/action.yml
@@ -34,17 +34,24 @@ runs:
     - name: download and extract persistent artifacts from s3
       shell: bash
       run: |
-        HASH=$(md5sum package-lock.json | cut -f 1 -d " ")
+        HASH=$(cat package-lock.json | shasum -a 512 | cut -d ' ' -f 1)
         REMOTE_PATH="alfresco-ng2-components/build-cache/${HASH}"
-        echo remote path $REMOTE_PATH
         if [ -n "${{ inputs.cache-key-suffix }}" ]; then
           REMOTE_PATH="${REMOTE_PATH}-${{ inputs.cache-key-suffix }}"
-        fi      
+        fi
+        echo "remote path $REMOTE_PATH"
         packages=( $(echo ${{ inputs.persistent-packages }}) )
         for i in "${packages[@]}"; do
-          time aws s3 cp --no-progress s3://${S3_BUILD_BUCKET_SHORT_NAME}/${REMOTE_PATH}/$i.tar.gz $i.tar.gz
-          du -h $i.tar.gz
-          time tar xzf $i.tar.gz
+          REMOTE_FILE_PATH="s3://${S3_BUILD_BUCKET_SHORT_NAME}/${REMOTE_PATH}/$i.tar.gz"
+          cache_exists=$(aws s3 ls $REMOTE_FILE_PATH)
+          if [ -n "$exists" ]; then
+            time aws s3 cp --no-progress REMOTE_FILE_PATH $i.tar.gz
+            du -h $i.tar.gz
+            time tar xzf $i.tar.gz
+          else
+            echo "file not found $REMOTE_FILE_PATH. continue."
+          fi        
+
         done        
     - name: show files
       shell: bash
diff --git a/.github/actions/upload-cache-and-artifacts/action.yml b/.github/actions/upload-cache-and-artifacts/action.yml
index 62f4d0eb1b..df5555079c 100644
--- a/.github/actions/upload-cache-and-artifacts/action.yml
+++ b/.github/actions/upload-cache-and-artifacts/action.yml
@@ -33,7 +33,7 @@ runs:
     - name: tar and upload persistent artifacts
       shell: bash
       run: |
-        HASH=$(md5sum package-lock.json | cut -f 1 -d " ")
+        HASH=$(cat package-lock.json | shasum -a 512 | cut -d ' ' -f 1)
         REMOTE_PATH="alfresco-ng2-components/build-cache/${HASH}"
         if [ -n "${{ inputs.cache-key-suffix }}" ]; then
           REMOTE_PATH="${REMOTE_PATH}-${{ inputs.cache-key-suffix }}"