chore: more error fixes

software-mansion · Aug 9, 2024 · 9425f55 · 9425f55
1 parent 3b097c4
commit 9425f55
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 43 deletions.
diff --git a/.github/workflows/example-macos-build-check.yml b/.github/workflows/example-macos-build-check.yml
@@ -43,46 +43,46 @@ jobs:
 
       # Does this optimization even work with new yarn?
       # Perhaps we should cache `yarn's` cache instead?
-      - name: Restore node_modules from cache
-        id: monorepo-cache
-        uses: actions/cache@v3
-        with:
-          path: .
-          key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
-          restore-keys: ${{ runner.os }}-node-modules-
-      - name: Restore app node_modules from cache
-        id: app-cache
-        uses: actions/cache@v3
-        with:
-          path: ${{ ENV.WORKING_DIRECTORY }}/node_modules
-          key: ${{ runner.os }}-node-modules-${{ ENV.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/yarn.lock', ENV.WORKING_DIRECTORY)) }}
-          restore-keys: ${{ runner.os }}-node-modules-${{ ENV.WORKING_DIRECTORY }}-
+      # - name: Restore node_modules from cache
+      #   id: monorepo-cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: .
+      #     key: ${{ runner.os }}-node-modules-${{ hashFiles('yarn.lock') }}
+      #     restore-keys: ${{ runner.os }}-node-modules-
+      # - name: Restore app node_modules from cache
+      #   id: app-cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: ${{ ENV.WORKING_DIRECTORY }}/node_modules
+      #     key: ${{ runner.os }}-node-modules-${{ ENV.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/yarn.lock', ENV.WORKING_DIRECTORY)) }}
+      #     restore-keys: ${{ runner.os }}-node-modules-${{ ENV.WORKING_DIRECTORY }}-
       - name: Install monorepo node dependencies
-        if: steps.monorepo-cache.outputs.cache-hit != 'true' || steps.app-cache.outputs.cache-hit != 'true'
+        # if: steps.monorepo-cache.outputs.cache-hit != 'true' || steps.app-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
 
-      - name: Restore Pods from cache
-        id: pods-cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ env.WORKING_DIRECTORY }}/macos/Pods
-            ~/Library/Caches/CocoaPods
-            ~/.cocoapods
-          key: ${{ runner.os }}-macos-pods-${{ env.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/macos/Podfile.lock', env.WORKING_DIRECTORY)) }}
+      # - name: Restore Pods from cache
+      #   id: pods-cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: |
+      #       ${{ env.WORKING_DIRECTORY }}/macos/Pods
+      #       ~/Library/Caches/CocoaPods
+      #       ~/.cocoapods
+      #     key: ${{ runner.os }}-macos-pods-${{ env.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/macos/Podfile.lock', env.WORKING_DIRECTORY)) }}
 
       - name: Install Pods
-        if: steps.pods-cache.outputs.cache-hit != 'true'
+        # if: steps.pods-cache.outputs.cache-hit != 'true'
         working-directory: ${{ env.WORKING_DIRECTORY }}/macos
         run: bundle install && bundle exec pod install
 
-      - name: Restore build artifacts from cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            ${{ env.WORKING_DIRECTORY }}/macos/build
-            ~/Library/Developer/Xcode/DerivedData
-          key: ${{ runner.os }}-macos-build-${{ env.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/macos/Podfile.lock', env.WORKING_DIRECTORY)) }}
+      # - name: Restore build artifacts from cache
+      #   uses: actions/cache@v3
+      #   with:
+      #     path: |
+      #       ${{ env.WORKING_DIRECTORY }}/macos/build
+      #       ~/Library/Developer/Xcode/DerivedData
+      #     key: ${{ runner.os }}-macos-build-${{ env.WORKING_DIRECTORY }}-${{ hashFiles(format('{0}/macos/Podfile.lock', env.WORKING_DIRECTORY)) }}
 
       - name: Build app
         working-directory: ${{ env.WORKING_DIRECTORY }}

diff --git a/.github/workflows/expo-devclient-build-check-nightly.yml b/.github/workflows/expo-devclient-build-check-nightly.yml
@@ -1,7 +1,7 @@
 name: Expo DevClient build check [Nightly]
 env:
   YARN_ENABLE_HARDENED_MODE: 0
-  SCRIPT_PATH: ${{github.workspace}}/reanimated_repo/.github/workflows/helper/configureDevClient.js
+  SCRIPT_PATH: ${{github.workspace}}/${{github.repository}}/.github/workflows/helper/configureDevClient.js
 on:
   pull_request:
     paths:

diff --git a/.github/workflows/react-native-nightly-reanimated-build-check-nightly.yml b/.github/workflows/react-native-nightly-reanimated-build-check-nightly.yml
@@ -43,6 +43,9 @@ jobs:
       - name: Create app
         run: |
           yarn react-native init ${{ env.APP_NAME }} --version ${{ env.REACT_NATIVE_TAG }} --pm yarn --skip-install --install-pods false --skip-git-init
+      - name: Add yarn.lock in app
+        working-directory: ${{ env.APP_NAME }}
+        run: touch yarn.lock
       - name: Install Reanimated
         working-directory: ${{ env.APP_NAME }}
         run: yarn add react-native-reanimated@https://github.com/software-mansion/react-native-reanimated.git#commit=${{ github.sha }}

diff --git a/apps/macos-example/index.js b/apps/macos-example/index.js
@@ -1,7 +1,3 @@
-/**
- * @format
- */
-
 import { AppRegistry } from 'react-native';
 import App from './App';
 import { name as appName } from './app.json';

diff --git a/apps/macos-example/metro.config.js b/apps/macos-example/metro.config.js
@@ -9,12 +9,6 @@ const root = path.resolve(__dirname, '../..');
 
 const modules = [...Object.keys(pack.peerDependencies), 'react-native-macos'];
 
-/**
- * Metro configuration
- * https://facebook.github.io/metro/docs/configuration
- *
- * @type {import('metro-config').MetroConfig}
- */
 const config = {
   projectRoot: __dirname,
   watchFolders: [root],