From a7c5d4558b833ffc2163811cf52a0c7107e8eb9f Mon Sep 17 00:00:00 2001
From: Dan Caseley <dan@caseley.me.uk>
Date: Sun, 26 Jul 2020 21:42:59 +0100
Subject: [PATCH] Refine GH Actions logic

---
 .github/workflows/ios_detox.yml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ios_detox.yml b/.github/workflows/ios_detox.yml
index 1c1d96b09..f23d0f6b6 100644
--- a/.github/workflows/ios_detox.yml
+++ b/.github/workflows/ios_detox.yml
@@ -27,11 +27,11 @@ jobs:
         key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
 
     - name: Node
-      if: steps.detoxappcache.outputs.cache-hit == 'false'
+      if: steps.detoxappcache.outputs.cache-hit != 'true'
       uses: actions/setup-node@v1
 
     - name: Cache node modules
-      if: steps.detoxappcache.outputs.cache-hit == 'false'
+      if: steps.detoxappcache.outputs.cache-hit != 'true'
       uses: actions/cache@v1
       id: npmcache
       with:
@@ -39,15 +39,15 @@ jobs:
         key: node-modules-${{ hashFiles('**/yarn.lock') }}
 
     - name: Rebuild detox
-      if: steps.detoxappcache.outputs.cache-hit == 'false' && steps.npmcache.outputs.cache-hit == 'true'
+      if: steps.detoxappcache.outputs.cache-hit != 'true' && steps.npmcache.outputs.cache-hit == 'true'
       run: yarn detox clean-framework-cache && yarn detox build-framework-cache
 
     - name: Install Dependencies
-      if: steps.detoxappcache.outputs.cache-hit == 'false' && steps.npmcache.outputs.cache-hit != 'true'
+      if: steps.detoxappcache.outputs.cache-hit != 'true' && steps.npmcache.outputs.cache-hit != 'true'
       run: yarn install
 
     - run: yarn detox build e2e --configuration ios.sim.release
-      if: steps.detoxappcache.outputs.cache-hit == 'false'
+      if: steps.detoxappcache.outputs.cache-hit != 'true'
 
   detox-test-rooms:
     needs: detox-build
@@ -73,6 +73,10 @@ jobs:
         path: ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
         key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
 
+    - name: Check for Detox app
+      if: steps.detoxappcache.outputs.cache-hit != 'true'
+      run: exit 1
+
     - name: Node
       uses: actions/setup-node@v1
 
@@ -93,7 +97,7 @@ jobs:
 
     - run: brew tap wix/brew
     - run: brew install applesimutils
-    - run: yarn detox test e2e/tests/rooms --configuration ios.sim.release
+    - run: yarn detox test e2e/tests/room --configuration ios.sim.release
 
   detox-test-assorted:
     needs: detox-build
@@ -119,6 +123,10 @@ jobs:
         path: ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
         key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
 
+    - name: Check for Detox app
+      if: steps.detoxappcache.outputs.cache-hit != 'true'
+      run: exit 1
+
     - name: Node
       uses: actions/setup-node@v1
 
@@ -165,6 +173,10 @@ jobs:
         path: ios/build/Build/Products/Release-iphonesimulator/RocketChatRN.app
         key: iOSDetoxRelease-v3-${{ hashFiles('yarn.lock') }}-${{ hashFiles('ios/Podfile.lock') }}-${{ hashFiles('./app-git-revision.txt') }}
 
+    - name: Check for Detox app
+      if: steps.detoxappcache.outputs.cache-hit != 'true'
+      run: exit 1
+
     - name: Node
       uses: actions/setup-node@v1