Fix ios pipeline (#3874)

The pipeline was stuck on the ios step.  This was due to shared cache between
ios and catalyst builds.

.github/workflows/integration-tests.yml

@@ -4,16 +4,18 @@ on:
   pull_request:
     paths:
       # Source code
-      - '*'
-      - 'lib/**'
-      - 'src/**'
-      - 'types/**'
-      - 'react-native/**'
-      - 'vendor/**'
+      - "*"
+      - "lib/**"
+      - "src/**"
+      - "types/**"
+      - "react-native/**"
+      - "vendor/**"
       # Integration tests
-      - 'integration-tests/**'
+      - "integration-tests/**"
       # No need to run when updating documentation
-      - '!**.md'
+      - "!**.md"
+      # Run this on updates to the workflow
+      - ".github/workflows/integration-tests.yml"
 
 jobs:
   node:
@@ -30,7 +32,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
@@ -72,7 +74,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: actions/setup-node@v1
         with:
           node-version: 14
@@ -103,11 +105,11 @@ jobs:
         #TODO: Reactivate debug when builds are optimized
         #type: [Release, Debug]
         type: [Release]
-        platform: [{name: ios, build-configuration: simulator}, {name: catalyst, build-configuration: catalyst}]
+        platform: [{ name: ios, build-configuration: simulator }, { name: catalyst, build-configuration: catalyst }]
     steps:
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: actions/setup-node@v1
         with:
           node-version: 14
@@ -136,25 +138,25 @@ jobs:
         name: Restore iOS build folder from cache
         with:
           path: react-native/ios/build
-          key: ios-build-dir-${{ hashFiles('src/**', 'react-native/ios/**', 'vendor/**') }}
+          key: ios-build-dir-${matrix.platform.name}-${matrix.type}-${{ hashFiles('src/**', 'react-native/ios/**', 'vendor/**') }}
           restore-keys: |
             ios-build-dir-
       - uses: actions/cache@v2
         name: Restore xcframework from cache
         id: cache-xcframework
         with:
           path: react-native/ios/realm-js-ios.xcframework
-          key: xcframework-${{ hashFiles('src/**', 'react-native/ios/**', 'vendor/**') }}
+          key: xcframework-${matrix.platform.name}-${matrix.type}-${{ hashFiles('src/**', 'react-native/ios/**', 'vendor/**') }}
       - uses: actions/cache@v2
         name: Restore Xcode "derived data" from cache
         with:
           path: ~/Library/Developer/Xcode/DerivedData
-          key: xcode-derived-data
+          key: xcode-derived-data-${matrix.platform.name}-${matrix.type}
       - uses: actions/cache@v2
         name: Restore CocoaPods from cache
         with:
           path: integration-tests/environments/react-native/ios/Pods
-          key: cocoapods-${{ hashFiles('integration-tests/environments/react-native/ios/Podfile.lock') }}
+          key: cocoapods-${matrix.platform.name}-${matrix.type}-${{ hashFiles('integration-tests/environments/react-native/ios/Podfile.lock') }}
           restore-keys: | # Enables running from an old build
             cocoapods-
 
@@ -191,7 +193,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          submodules: 'recursive'
+          submodules: "recursive"
       - uses: actions/setup-node@v1
         with:
           node-version: 14