fix: run e2e ios tests on macos-14 m1

synonymdev · Jun 29, 2024 · a9b1612 · a9b1612
1 parent 105e664
commit a9b1612
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 76 deletions.
diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml
@@ -1,5 +1,8 @@
 name: e2e-ios
 
+env:
+  NO_FLIPPER: 1
+
 on:
   pull_request:
     branches:
@@ -10,63 +13,36 @@ on:
 
 jobs:
   e2e-ios:
-    runs-on: macos-12
+    runs-on: macos-14
     timeout-minutes: 120
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
       - name: Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 18
           cache: 'yarn' # cache packages, but not node_modules
           cache-dependency-path: 'example/yarn.lock'
 
-      - name: Cache lib node modules
-        uses: actions/cache@v3
-        id: lib-npmcache
-        with:
-          path: lib/node_modules
-          key: node-modules-${{ hashFiles('**/yarn.lock') }}
-
       - name: Install lib dependencies
-        if: steps.lib-npmcache.outputs.cache-hit != 'true'
         working-directory: lib
-        run: yarn install
+        run: yarn install || yarn install
 
       - name: Build lib
         working-directory: lib
         run: yarn build
 
-      - name: Cache app node modules
-        uses: actions/cache@v3
-        id: cache-nm
-        with:
-          path: example/node_modules
-          key: node-modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Rebuild detox
-        if: steps.cache-nm.outputs.cache-hit == 'true'
-        working-directory: example
-        run: yarn detox clean-framework-cache && yarn detox build-framework-cache
-
       - name: Install Dependencies
-        if: steps.cache-nm.outputs.cache-hit != 'true'
         working-directory: example
-        run: yarn install && yarn rn-setup
-
-      # - name: Activate react-native-skia-stup
-      #   run: |
-      #     yarn add @shopify/react-native-skia@0.1.156 git+ssh://git@github.com/limpbrains/react-native-skia-stub
-      #     patch -p1 < .github/workflows/react-native-skia-stub.patch
+        run: (yarn || yarn) && yarn rn-setup
 
       - name: Cache Pods
-        uses: actions/cache@v3
-        id: podcache
+        uses: actions/cache@v4
         with:
           path: example/ios/Pods
           key: pods-${{ hashFiles('**/Podfile.lock') }}
@@ -75,7 +51,7 @@ jobs:
         working-directory: example
         run: |
           gem update cocoapods xcodeproj
-          cd ios && pod install && cd ..
+          pod install --project-directory=ios
 
       - name: Install applesimutils
         run: |
@@ -84,14 +60,14 @@ jobs:
 
       - name: Build
         working-directory: example
-        run: yarn e2e:build:ios-release
+        run: yarn e2e:build:ios-release || yarn e2e:build:ios-release
 
       - name: Test iOS app
         working-directory: example
-        run: yarn e2e:test:ios-release || yarn e2e:test:ios-release || yarn e2e:test:ios-release
+        run: yarn e2e:test:ios-release || yarn e2e:test:ios-release
 
-      - uses: actions/upload-artifact@v3
-        if: failure()
+      - uses: actions/upload-artifact@v4
+        # if: failure()
         with:
           name: e2e-test-videos
           path: ./example/artifacts/
diff --git a/.github/workflows/mocha-ios.yml b/.github/workflows/mocha-ios.yml
@@ -1,5 +1,8 @@
 name: mocha-ios
 
+env:
+  NO_FLIPPER: 1
+
 on:
   pull_request:
     branches:
@@ -10,12 +13,12 @@ on:
 
 jobs:
   mocha-ios:
-    runs-on: macos-12
+    runs-on: macos-13
     timeout-minutes: 120
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
 
@@ -31,15 +34,15 @@ jobs:
         if: steps.docker1.outcome != 'success'
         uses: douglascamata/setup-docker-macos-action@v1-alpha
         id: docker2
-        continue-on-error: true
+        # continue-on-error: true
         with:
           lima: v0.18.0
           colima: v0.5.6
 
-      - name: Setup Docker Default
-        if: steps.docker1.outcome != 'success' && steps.docker2.outcome != 'success'
-        uses: docker-practice/actions-setup-docker@1.0.12
-        timeout-minutes: 30
+      # - name: Setup Docker Default
+      #   if: steps.docker1.outcome != 'success' && steps.docker2.outcome != 'success'
+      #   uses: docker-practice/actions-setup-docker@1.0.12
+      #   timeout-minutes: 30
 
       - name: Install backup-server dependencies
         working-directory: backup-server
@@ -58,48 +61,26 @@ jobs:
         run: while ! nc -z '127.0.0.1' 60001; do sleep 1; done
 
       - name: Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
           cache: 'yarn' # cache packages, but not node_modules
           cache-dependency-path: 'example/yarn.lock'
 
-      - name: Cache lib node modules
-        uses: actions/cache@v3
-        id: lib-npmcache
-        with:
-          path: lib/node_modules
-          key: node-modules-${{ hashFiles('**/yarn.lock') }}
-
       - name: Install lib dependencies
-        if: steps.lib-npmcache.outputs.cache-hit != 'true'
         working-directory: lib
-        run: yarn --no-audit --prefer-offline || yarn --no-audit --prefer-offline
+        run: yarn || yarn
 
       - name: Build lib
         working-directory: lib
         run: yarn build
 
-      - name: Cache app node modules
-        uses: actions/cache@v3
-        id: cache-nm
-        with:
-          path: example/node_modules
-          key: node-modules-${{ hashFiles('**/yarn.lock') }}
-
-      - name: Rebuild detox
-        if: steps.cache-nm.outputs.cache-hit == 'true'
-        working-directory: example
-        run: yarn detox clean-framework-cache && yarn detox build-framework-cache
-
       - name: Install Dependencies
-        if: steps.cache-nm.outputs.cache-hit != 'true'
         working-directory: example
-        run: yarn install --no-audit --prefer-offline && yarn rn-setup
+        run: (yarn || yarn) && yarn rn-setup
 
       - name: Cache Pods
-        uses: actions/cache@v3
-        id: podcache
+        uses: actions/cache@v4
         with:
           path: example/ios/Pods
           key: pods-${{ hashFiles('**/Podfile.lock') }}
@@ -108,7 +89,7 @@ jobs:
         working-directory: example
         run: |
           gem update cocoapods xcodeproj
-          cd ios && pod install && cd ..
+          pod install --project-directory=ios
 
       - name: Install applesimutils
         run: |
@@ -117,19 +98,19 @@ jobs:
 
       - name: Build
         working-directory: example
-        run: npx react-native run-ios --no-packager
+        run: npx react-native run-ios --no-packager --simulator='iPhone 14'
 
       - name: Test iOS app
         working-directory: example
         run: yarn test:mocha:ios
 
       - name: Prepare articrafts
-        if: failure()
+        # if: failure()
         run: |
           mkdir articrafts
           find /Users/runner/Library/Developer/CoreSimulator/Devices/ -path '*Documents/ldk' -exec cp -r "{}" articrafts/ \;
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: ldk-data