chore: setting timeout for retrieving cache. updating cli command

aws-amplify · Aug 30, 2023 · 588f8ae · 588f8ae
1 parent ffe3f18
commit 588f8ae
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 11 deletions.
diff --git a/.github/workflows/build_amplify_swift_for_testing.yml b/.github/workflows/build_amplify_swift_for_testing.yml
@@ -7,9 +7,8 @@ on:
         type: string
   workflow_dispatch:
   push:
-    branches-ignore:
-      - main
-      - release
+    # branches:
+    #   - main
 
 permissions:
   contents: read
@@ -60,8 +59,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         continue-on-error: true
         run: |
-          gh extension install actions/gh-actions-cache
-          gh actions-cache delete ${{ steps.cache-build.outputs.cache-primary-key }} --confirm
+          gh cache delete ${{ steps.cache-build.outputs.cache-primary-key }} --confirm
         shell: bash
       - name: Save the build cache
         uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -110,8 +108,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         continue-on-error: true
         run: |
-          gh extension install actions/gh-actions-cache
-          gh actions-cache delete ${{ steps.cache-build.outputs.cache-primary-key }} --confirm
+          gh cache delete ${{ steps.cache-build.outputs.cache-primary-key }} --confirm
         shell: bash
       - name: Save the build cache
         uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -160,8 +157,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         continue-on-error: true
         run: |
-          gh extension install actions/gh-actions-cache
-          gh actions-cache delete ${{ steps.cache-build.outputs.cache-primary-key }} --confirm
+          gh cache delete ${{ steps.cache-build.outputs.cache-primary-key }} --confirm
         shell: bash
       - name: Save the build cache
         uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
@@ -210,8 +206,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         continue-on-error: true
         run: |
-          gh extension install actions/gh-actions-cache
-          gh actions-cache delete ${{ steps.cache-build.outputs.cache-primary-key }} --confirm
+          gh cache delete ${{ steps.cache-build.outputs.cache-primary-key }}
         shell: bash
       - name: Save the build cache
         uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1

diff --git a/.github/workflows/run_xcodebuild_test_platforms.yml b/.github/workflows/run_xcodebuild_test_platforms.yml
@@ -54,13 +54,17 @@ jobs:
             amplify-packages-
       - name: Attempt to restore the scheme build cache
         id: restore-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
           key: ${{ env.SCHEME }}-iOS-build-${{ github.sha }}
       - name: Attempt to restore the Amplify build cache
         if: steps.restore-build.outputs.cache-hit != true
         id: restore-amplify-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
@@ -129,13 +133,17 @@ jobs:
             amplify-packages-
       - name: Attempt to restore the scheme build cache
         id: restore-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
           key: ${{ env.SCHEME }}-macOS-build-${{ github.sha }}
       - name: Attempt to restore the Amplify build cache
         if: steps.restore-build.outputs.cache-hit != true
         id: restore-amplify-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
@@ -195,13 +203,17 @@ jobs:
             amplify-packages-
       - name: Attempt to restore the scheme build cache
         id: restore-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
           key: ${{ env.SCHEME }}-tvOS-build-${{ github.sha }}
       - name: Attempt to restore the Amplify build cache
         if: steps.restore-build.outputs.cache-hit != true
         id: restore-amplify-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
@@ -261,13 +273,17 @@ jobs:
             amplify-packages-
       - name: Attempt to restore the scheme build cache
         id: restore-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
           key: ${{ env.SCHEME }}-watchOS-build-${{ github.sha }}
       - name: Attempt to restore the Amplify build cache
         if: steps.restore-build.outputs.cache-hit != true
         id: restore-amplify-build
+        timeout-minutes: 4
+        continue-on-error: true
         uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build