Skip to content

Commit 8df011d

Browse files
CedricGuillemetCedricGuillemet
authored
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
1 parent edbc555 commit 8df011d

File tree

10 files changed

+71
-40
lines changed

10 files changed

+71
-40
lines changed

‎.github/workflows/bn_master_commit.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ jobs:
1616
uses: actions/[email protected]
1717
with:
1818
submodules: 'recursive'
19+
- name: Free space
20+
uses: ./.github/workflows/macos_freespace
1921
- name: Setup Node 16
2022
uses: actions/setup-node@v3
2123
with:
@@ -55,6 +57,8 @@ jobs:
5557
uses: actions/[email protected]
5658
with:
5759
submodules: 'recursive'
60+
- name: Free space
61+
uses: ./.github/workflows/macos_freespace
5862
- name: Setup Node 16
5963
uses: actions/setup-node@v3
6064
with:

‎.github/workflows/ios_android.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
type: string
1212
xcode-version:
1313
type: string
14-
default: '15.0.1'
14+
default: '15.4'
1515

1616
jobs:
1717
Build:
@@ -21,6 +21,8 @@ jobs:
2121
uses: actions/[email protected]
2222
with:
2323
submodules: 'recursive'
24+
- name: Free space
25+
uses: ./.github/workflows/macos_freespace
2426
- name: Setup Node 16
2527
uses: actions/setup-node@v3
2628
with:
@@ -54,12 +56,12 @@ jobs:
5456
env:
5557
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
5658
- name: Upload Assembled iOS Android Folder
57-
uses: actions/upload-artifact@v2
59+
uses: actions/upload-artifact@v4
5860
with:
5961
name: 'Assembled-iOSAndroid${{ inputs.react-native-version }}'
6062
path: Package/Assembled-iOSAndroid
6163
- name: Upload Assembled iOS Android BaseKit Folder
62-
uses: actions/upload-artifact@v2
64+
uses: actions/upload-artifact@v4
6365
with:
6466
name: 'Assembled-BaseKit-iOSAndroid${{ inputs.react-native-version }}'
6567
path: Package/Assembled-BaseKit-iOSAndroid

‎.github/workflows/macos_freespace/action.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: Free up disk space
2+
description: Free up disk space see https://github.com/actions/runner-images/issues/10511
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Free up disk space
7+
shell: bash
8+
run: |
9+
xcrun simctl delete all
10+
sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
11+
sudo rm -rf /Applications/Xcode_14.3.1.app
12+
sudo rm -rf /Applications/Xcode_15.0.1.app
13+
sudo rm -rf /Applications/Xcode_15.1.app
14+
sudo rm -rf /Applications/Xcode_15.2.app
15+
sudo rm -rf /Applications/Xcode_15.3.app

‎.github/workflows/pr.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
uses: actions/[email protected]
1515
with:
1616
submodules: 'recursive'
17+
- name: Free space
18+
uses: ./.github/workflows/macos_freespace
1719
- name: Setup Node 16
1820
uses: actions/setup-node@v3
1921
with:
@@ -52,6 +54,8 @@ jobs:
5254
uses: actions/[email protected]
5355
with:
5456
submodules: 'recursive'
57+
- name: Free space
58+
uses: ./.github/workflows/macos_freespace
5559
- name: Setup CMake
5660
uses: jwlawson/[email protected]
5761
with:
@@ -90,6 +94,8 @@ jobs:
9094
uses: actions/[email protected]
9195
with:
9296
submodules: 'recursive'
97+
- name: Free space
98+
uses: ./.github/workflows/macos_freespace
9399
- name: Setup Node 16
94100
uses: actions/setup-node@v3
95101
with:
@@ -114,6 +120,8 @@ jobs:
114120
uses: actions/[email protected]
115121
with:
116122
submodules: 'recursive'
123+
- name: Free space
124+
uses: ./.github/workflows/macos_freespace
117125
- name: Setup Watchman
118126
run: brew install watchman
119127

@@ -139,6 +147,8 @@ jobs:
139147
uses: actions/[email protected]
140148
with:
141149
submodules: 'recursive'
150+
- name: Free space
151+
uses: ./.github/workflows/macos_freespace
142152
- name: Setup Node 16
143153
uses: actions/setup-node@v3
144154
with:
@@ -323,4 +333,4 @@ jobs:
323333
build-typescript:
324334
uses: ./.github/workflows/typescript.yml
325335
with:
326-
release-version: 0.0.${GITHUB_SHA::8}
336+
release-version: 0.0.${GITHUB_SHA::8}

‎.github/workflows/test_version.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
msbuild.exe /p:Configuration="Release" /p:Platform="x64" /m "./windows/Playground.sln"
5858
5959
- name: Upload UWP x64
60-
uses: actions/upload-artifact@v2
60+
uses: actions/upload-artifact@v4
6161
with:
6262
name: 'WindowsAppx'
6363
path: Playground/windows/AppPackages/Playground/Playground_1.0.0.0_x64_Test/ #Playground_1.0.0.0_x64.appx
@@ -94,7 +94,7 @@ jobs:
9494
./gradlew app:assembleRelease --stacktrace --info
9595
9696
- name: Upload APK
97-
uses: actions/upload-artifact@v2
97+
uses: actions/upload-artifact@v4
9898
with:
9999
name: 'AndroidAPK'
100100
path: Playground/android/app/build/outputs/apk/release/app-release.apk
@@ -128,7 +128,7 @@ jobs:
128128
xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive
129129
130130
- name: Upload iOS App
131-
uses: actions/upload-artifact@v2
131+
uses: actions/upload-artifact@v4
132132
with:
133133
name: 'iOSApp'
134134
path: Playground/ios/playgroundSimulator.xcarchive
@@ -164,7 +164,7 @@ jobs:
164164
./gradlew app:assembleRelease --stacktrace --info
165165
166166
- name: Upload APK
167-
uses: actions/upload-artifact@v2
167+
uses: actions/upload-artifact@v4
168168
with:
169169
name: 'AndroidBasekitAPK'
170170
path: Playground/android/app/build/outputs/apk/release/app-release.apk
@@ -197,7 +197,7 @@ jobs:
197197
xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive
198198
199199
- name: Upload iOS App
200-
uses: actions/upload-artifact@v2
200+
uses: actions/upload-artifact@v4
201201
with:
202202
name: 'iOSBasekitApp'
203203
path: Playground/ios/playgroundSimulator.xcarchive
@@ -207,7 +207,7 @@ jobs:
207207
# runs-on: macos-latest
208208
# steps:
209209
# - name: Download APK
210-
# uses: actions/download-artifact@v2
210+
# uses: actions/download-artifact@v4
211211
# with:
212212
# name: 'AndroidAPK'
213213
# path: ./

‎.github/workflows/typescript.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: npx gulp buildTS --releaseVersion ${{ inputs.release-version }}
3232
working-directory: ./Package
3333
- name: Upload Assembled Folder
34-
uses: actions/upload-artifact@v2
34+
uses: actions/upload-artifact@v4
3535
with:
3636
name: 'Assembled'
3737
path: Package/Assembled

‎.github/workflows/windows.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ jobs:
4141
run: npx gulp buildUWPPublish --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }}
4242
working-directory: ./Package
4343
- name: Upload Assembled-Windows Folder
44-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v4
4545
with:
4646
name: 'Assembled-Windows${{ inputs.react-native-version }}'
4747
path: Package/Assembled-Windows
4848
- name: Upload Assembled-BaseKit-Windows Folder
49-
uses: actions/upload-artifact@v2
49+
uses: actions/upload-artifact@v4
5050
with:
5151
name: 'Assembled-BaseKit-Windows${{ inputs.react-native-version }}'
5252
path: Package/Assembled-BaseKit-Windows

‎Apps/BRNPlayground/metro.config.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ module.exports = makeMetroConfig({
1111
}),
1212
},
1313
watchFolders: [
14-
path.join(__dirname, "node_modules", "@babylonjs/react-native"),
15-
path.join(__dirname, "node_modules", "@babylonjs/react-native-iosandroid"),
16-
path.join(__dirname, "node_modules", "@babylonjs/react-native-windows"),
14+
path.dirname(require.resolve("@babylonjs/react-native/package.json")),
15+
path.dirname(require.resolve("@babylonjs/react-native-iosandroid/package.json")),
16+
path.dirname(require.resolve("@babylonjs/react-native-windows/package.json")),
1717
],
1818
});

‎Apps/BRNPlayground/package-lock.json

Lines changed: 23 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Apps/BRNPlayground/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"jest": "^29.6.3",
4646
"mkdirp": "^1.0.0",
4747
"prettier": "2.8.8",
48-
"react-native-test-app": "^3.4.2",
48+
"react-native-test-app": "^3.10.3",
4949
"react-test-renderer": "18.2.0",
5050
"typescript": "5.0.4"
5151
},

0 commit comments

Comments
 (0)