Fix build after VMs update (#657)

* bump NDK version * Revert "bump NDK version" This reverts commit 93784b8. * composite action to free up space * moved action * checkout then free up space * using statement * composite * missing free space for ios_android.yml * xcode 15.4 as default * up RNTA, fix metro.config.js * fix double copy/paste * upload artifact acion
BabylonJS · Sep 11, 2024 · 8df011d · 8df011d
1 parent edbc555
commit 8df011d
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 40 deletions.
diff --git a/.github/workflows/bn_master_commit.yml b/.github/workflows/bn_master_commit.yml
@@ -16,6 +16,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
@@ -55,6 +57,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:

diff --git a/.github/workflows/ios_android.yml b/.github/workflows/ios_android.yml
@@ -11,7 +11,7 @@ on:
         type: string
       xcode-version:
         type: string
-        default: '15.0.1'
+        default: '15.4'
 
 jobs:
   Build:
@@ -21,6 +21,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
@@ -54,12 +56,12 @@ jobs:
         env:
           JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
       - name: Upload Assembled iOS Android Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-iOSAndroid${{ inputs.react-native-version }}'
           path: Package/Assembled-iOSAndroid
       - name: Upload Assembled iOS Android BaseKit Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-BaseKit-iOSAndroid${{ inputs.react-native-version }}'
           path: Package/Assembled-BaseKit-iOSAndroid
diff --git a/.github/workflows/macos_freespace/action.yml b/.github/workflows/macos_freespace/action.yml
@@ -0,0 +1,15 @@
+name: Free up disk space
+description: Free up disk space see https://github.com/actions/runner-images/issues/10511
+runs:
+  using: "composite"
+  steps:
+    - name: Free up disk space
+      shell: bash
+      run: |
+        xcrun simctl delete all
+        sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
+        sudo rm -rf /Applications/Xcode_14.3.1.app
+        sudo rm -rf /Applications/Xcode_15.0.1.app
+        sudo rm -rf /Applications/Xcode_15.1.app
+        sudo rm -rf /Applications/Xcode_15.2.app
+        sudo rm -rf /Applications/Xcode_15.3.app
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -14,6 +14,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
@@ -52,6 +54,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup CMake
         uses: jwlawson/[email protected]
         with:
@@ -90,6 +94,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
@@ -114,6 +120,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Watchman
         run: brew install watchman
 
@@ -139,6 +147,8 @@ jobs:
         uses: actions/[email protected]
         with:
           submodules: 'recursive'
+      - name: Free space
+        uses: ./.github/workflows/macos_freespace
       - name: Setup Node 16
         uses: actions/setup-node@v3
         with:
@@ -323,4 +333,4 @@ jobs:
   build-typescript:
     uses: ./.github/workflows/typescript.yml
     with:
-      release-version: 0.0.${GITHUB_SHA::8}
+      release-version: 0.0.${GITHUB_SHA::8}
diff --git a/.github/workflows/test_version.yml b/.github/workflows/test_version.yml
@@ -57,7 +57,7 @@ jobs:
           msbuild.exe /p:Configuration="Release" /p:Platform="x64" /m "./windows/Playground.sln"
 
       - name: Upload UWP x64
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'WindowsAppx'
           path: Playground/windows/AppPackages/Playground/Playground_1.0.0.0_x64_Test/ #Playground_1.0.0.0_x64.appx
@@ -94,7 +94,7 @@ jobs:
           ./gradlew app:assembleRelease --stacktrace --info
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'AndroidAPK'
           path: Playground/android/app/build/outputs/apk/release/app-release.apk
@@ -128,7 +128,7 @@ jobs:
           xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive
 
       - name: Upload iOS App
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'iOSApp'
           path: Playground/ios/playgroundSimulator.xcarchive
@@ -164,7 +164,7 @@ jobs:
           ./gradlew app:assembleRelease --stacktrace --info
 
       - name: Upload APK
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'AndroidBasekitAPK'
           path: Playground/android/app/build/outputs/apk/release/app-release.apk
@@ -197,7 +197,7 @@ jobs:
           xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive
 
       - name: Upload iOS App
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'iOSBasekitApp'
           path: Playground/ios/playgroundSimulator.xcarchive
@@ -207,7 +207,7 @@ jobs:
 #   runs-on: macos-latest
 #   steps:
 #   - name: Download APK
-#     uses: actions/download-artifact@v2
+#     uses: actions/download-artifact@v4
 #     with:
 #       name: 'AndroidAPK'
 #       path: ./

diff --git a/.github/workflows/typescript.yml b/.github/workflows/typescript.yml
@@ -31,7 +31,7 @@ jobs:
         run: npx gulp buildTS --releaseVersion ${{ inputs.release-version }}
         working-directory: ./Package
       - name: Upload Assembled Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled'
           path: Package/Assembled
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -41,12 +41,12 @@ jobs:
         run: npx gulp buildUWPPublish --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }}
         working-directory: ./Package
       - name: Upload Assembled-Windows Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-Windows${{ inputs.react-native-version }}'
           path: Package/Assembled-Windows
       - name: Upload Assembled-BaseKit-Windows Folder
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: 'Assembled-BaseKit-Windows${{ inputs.react-native-version }}'
           path: Package/Assembled-BaseKit-Windows
diff --git a/Apps/BRNPlayground/metro.config.js b/Apps/BRNPlayground/metro.config.js
@@ -11,8 +11,8 @@ module.exports = makeMetroConfig({
     }),
   },
   watchFolders: [
-    path.join(__dirname, "node_modules", "@babylonjs/react-native"),
-    path.join(__dirname, "node_modules", "@babylonjs/react-native-iosandroid"),
-    path.join(__dirname, "node_modules", "@babylonjs/react-native-windows"),
+    path.dirname(require.resolve("@babylonjs/react-native/package.json")),
+    path.dirname(require.resolve("@babylonjs/react-native-iosandroid/package.json")),
+    path.dirname(require.resolve("@babylonjs/react-native-windows/package.json")),
   ],
 });
diff --git a/Apps/BRNPlayground/package-lock.json b/Apps/BRNPlayground/package-lock.json
diff --git a/Apps/BRNPlayground/package.json b/Apps/BRNPlayground/package.json
@@ -45,7 +45,7 @@
     "jest": "^29.6.3",
     "mkdirp": "^1.0.0",
     "prettier": "2.8.8",
-    "react-native-test-app": "^3.4.2",
+    "react-native-test-app": "^3.10.3",
     "react-test-renderer": "18.2.0",
     "typescript": "5.0.4"
   },