From b75da2be3852c4e4fa43d9666d5703407ed44a2a Mon Sep 17 00:00:00 2001
From: Sebastian Villena <97059974+ruisebas@users.noreply.github.com>
Date: Wed, 30 Aug 2023 16:16:20 -0400
Subject: [PATCH] adding condition to enforce

---
 .../build_amplify_swift_for_testing.yml       | 57 +++++++++++--------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/build_amplify_swift_for_testing.yml b/.github/workflows/build_amplify_swift_for_testing.yml
index 7108aa0227..56b2a9f999 100644
--- a/.github/workflows/build_amplify_swift_for_testing.yml
+++ b/.github/workflows/build_amplify_swift_for_testing.yml
@@ -13,6 +13,7 @@ on:
 
 permissions:
   contents: read
+  actions: write
 
 concurrency:
   group: ${{ inputs.identifier || github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -26,37 +27,47 @@ jobs:
       - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 #v3.5.3
         with:
           persist-credentials: false
-      - name: Attempt to restore dependencies cache
-        id: cache-packages
-        timeout-minutes: 4
-        continue-on-error: true
-        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
-        with:
-          path: ~/Library/Developer/Xcode/DerivedData/Amplify
-          key: amplify-packages-${{ hashFiles('Package.resolved') }}
-          restore-keys: |
-            amplify-packages-
+      # - name: Attempt to restore dependencies cache
+      #   id: cache-packages
+      #   timeout-minutes: 4
+      #   continue-on-error: true
+      #   uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+      #   with:
+      #     path: ~/Library/Developer/Xcode/DerivedData/Amplify
+      #     key: amplify-packages-${{ hashFiles('Package.resolved') }}
+      #     restore-keys: |
+      #       amplify-packages-
       - name: Restore the build cache
         id: cache-build
         timeout-minutes: 4
         continue-on-error: true
-        uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        uses: actions/cache/restore@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
         with:
           path: ${{ github.workspace }}/Build
           key: amplify-iOS-latest-build-main
-      - name: Build Amplify Swift for iOS
-        uses: ./.github/composite_actions/run_xcodebuild
-        with:
-          scheme: Amplify-Package
-          destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4'
-          xcode_path: '/Applications/Xcode_14.3.app'
-          disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }}
-          build_for_testing: true
-          other_flags: '-derivedDataPath Build -clonedSourcePackagesDirPath ~/Library/Developer/Xcode/DerivedData/Amplify'
-      - name: Enforce a cache update
+      # - name: Build Amplify Swift for iOS
+      #   uses: ./.github/composite_actions/run_xcodebuild
+      #   with:
+      #     scheme: Amplify-Package
+      #     destination: 'platform=iOS Simulator,name=iPhone 14,OS=16.4'
+      #     xcode_path: '/Applications/Xcode_14.3.app'
+      #     disable_package_resolution: ${{ steps.cache-packages.outputs.cache-hit }}
+      #     build_for_testing: true
+      #     other_flags: '-derivedDataPath Build -clonedSourcePackagesDirPath ~/Library/Developer/Xcode/DerivedData/Amplify'
+      - name: Delete the old build cache
+        if: steps.cache-build.outputs.cache-hit
+        env:
+          GH_TOKEN: ${{ github.token }}
+        continue-on-error: true
         run: |
-          CACHE_KEY="amplify-iOS-latest-build-$GITHUB_SHA"
-          echo "STATE_CACHE_RESULT=${CACHE_KEY}" >> $GITHUB_ENV
+          gh extension install actions/gh-actions-cache
+          gh actions-cache delete amplify-iOS-latest-build-main --confirm
+        shell: bash
+      - name: Save the build cache
+        uses: actions/cache/save@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
+        with:
+          path: ${{ github.workspace }}/Build
+          key: amplify-iOS-latest-build-main
 
   build-for-testing-amplify-swift-macOS:
     runs-on: macos-13