From adaf9c3bc1459348bcbd2e0e9076e8db8bbf7340 Mon Sep 17 00:00:00 2001 From: Ivan Vershigora Date: Fri, 28 Jun 2024 14:54:47 +0100 Subject: [PATCH] fix: wip --- .github/workflows/e2e-ios.yml | 10 ++----- .github/workflows/mocha-ios.yml | 52 ++++++++++----------------------- 2 files changed, 18 insertions(+), 44 deletions(-) diff --git a/.github/workflows/e2e-ios.yml b/.github/workflows/e2e-ios.yml index 19095d34..386e1d97 100644 --- a/.github/workflows/e2e-ios.yml +++ b/.github/workflows/e2e-ios.yml @@ -38,10 +38,6 @@ jobs: working-directory: example run: (yarn || yarn) && yarn rn-setup - # - name: Rebuild detox - # working-directory: example - # run: yarn detox clean-framework-cache && yarn detox build-framework-cache - - name: Cache Pods uses: actions/cache@v4 with: @@ -61,14 +57,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 + run: yarn e2e:test:ios-release || yarn e2e:test:ios-release - uses: actions/upload-artifact@v4 - if: failure() + # if: failure() with: name: e2e-test-videos path: ./example/artifacts/ diff --git a/.github/workflows/mocha-ios.yml b/.github/workflows/mocha-ios.yml index 65d05aee..b2770135 100644 --- a/.github/workflows/mocha-ios.yml +++ b/.github/workflows/mocha-ios.yml @@ -10,12 +10,12 @@ on: jobs: mocha-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 @@ -31,15 +31,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 +58,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 +86,7 @@ jobs: working-directory: example run: | gem update cocoapods xcodeproj - cd ios && pod install && cd .. + pod install --project-directory=ios - name: Install applesimutils run: | @@ -123,13 +101,13 @@ jobs: working-directory: example run: yarn test:mocha:ios - - name: Prepare articrafts + # - name: Prepare articrafts 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