Skip to content

Commit 0babdca

Browse files
CedricGuillemetCedricGuillemet
authored
Update BabylonNative (#664)
* Test build * no rnta * typo * BN update * update libraries after bgfx update * graphics warnings * disable warnings for Windows build * xcode scheme * no nativexr for Windows, add schemes for iOS in validation step * no xr for msvc * removed Windows XR support * NDK min is 23.1.7779620 * disable warnings xr android * no warning nativeCamera Android * disable XMLHttpRequest warnings * even less warnings * brings back rnta * windows rnta * action cache version * windows build link path * bimg and bx path * removed nativexr from linking * xr leftovers * lib webp windows * disable webp windows * Scheduling * scheduling path * actions/download-artifact version * test Xcode 16.2 * Test Node 18 * up cmake version * bump to 0.71 * no webp * removed webp * moved back to a version that should build * windows 2019 is deprecated * vs 2022 * windows sdk version * missing scheduling lib * WindowsTargetPlatformVersion test * disable windows * BN commit id * Blob.xcscheme
1 parent e23d76a commit 0babdca

File tree

29 files changed

+574
-556
lines changed

29 files changed

+574
-556
lines changed

‎.github/workflows/bn_master_commit.yml

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -76,46 +76,46 @@ jobs:
7676
run: npx gulp buildIOS
7777
working-directory: ./Package
7878

79-
build-windows:
80-
name: Build Windows ${{ matrix.platform }} ${{ matrix.config }} - BabylonNative ${{ github.event.client_payload.sha }}
81-
runs-on: windows-2019
82-
strategy:
83-
matrix:
84-
platform: [x86, x64, ARM64]
85-
config: [Debug, Release]
86-
steps:
87-
- name: Checkout Repo
88-
uses: actions/[email protected]
89-
with:
90-
submodules: 'true'
91-
- name: Setup MSBuild
92-
uses: microsoft/[email protected]
93-
- name: Setup Node 16
94-
uses: actions/setup-node@v3
95-
with:
96-
node-version: 16
97-
- name: Setup NuGet
98-
uses: nuget/setup-nuget@v1
99-
with:
100-
nuget-version: '5.x'
101-
- name: NPM Install (Playground)
102-
run: npm install
103-
working-directory: ./Apps/Playground
104-
- name: NPM Install (React Native ${{ env.BRN_Version }})
105-
run: npm run select --reactNative ${{ env.BRN_Version }}
106-
working-directory: ./Apps/Playground
107-
- name: NPM Install (Binary Package)
108-
run: npm install
109-
working-directory: ./Package
110-
- name: Gulp Setup Project ${{ matrix.platform }} (Windows)
111-
run: npx gulp makeUWPProject${{ matrix.platform }}
112-
working-directory: ./Package
113-
- name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows)
114-
run: npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }}
115-
working-directory: ./Package
116-
- name: Gulp NuGet Restore Playground
117-
run: npx gulp nugetRestoreUWPPlayground
118-
working-directory: ./Package
119-
- name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows)
120-
run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }}
121-
working-directory: ./Package
79+
# build-windows:
80+
# name: Build Windows ${{ matrix.platform }} ${{ matrix.config }} - BabylonNative ${{ github.event.client_payload.sha }}
81+
# runs-on: windows-latest
82+
# strategy:
83+
# matrix:
84+
# platform: [x86, x64, ARM64]
85+
# config: [Debug, Release]
86+
# steps:
87+
# - name: Checkout Repo
88+
# uses: actions/[email protected]
89+
# with:
90+
# submodules: 'true'
91+
# - name: Setup MSBuild
92+
# uses: microsoft/[email protected]
93+
# - name: Setup Node 16
94+
# uses: actions/setup-node@v3
95+
# with:
96+
# node-version: 16
97+
# - name: Setup NuGet
98+
# uses: nuget/setup-nuget@v1
99+
# with:
100+
# nuget-version: '5.x'
101+
# - name: NPM Install (Playground)
102+
# run: npm install
103+
# working-directory: ./Apps/Playground
104+
# - name: NPM Install (React Native ${{ env.BRN_Version }})
105+
# run: npm run select --reactNative ${{ env.BRN_Version }}
106+
# working-directory: ./Apps/Playground
107+
# - name: NPM Install (Binary Package)
108+
# run: npm install
109+
# working-directory: ./Package
110+
# - name: Gulp Setup Project ${{ matrix.platform }} (Windows)
111+
# run: npx gulp makeUWPProject${{ matrix.platform }}
112+
# working-directory: ./Package
113+
# - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows)
114+
# run: npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }}
115+
# working-directory: ./Package
116+
# - name: Gulp NuGet Restore Playground
117+
# run: npx gulp nugetRestoreUWPPlayground
118+
# working-directory: ./Package
119+
# - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows)
120+
# run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }}
121+
# working-directory: ./Package

‎.github/workflows/pr.yml

Lines changed: 111 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
working-directory: ./Package
142142

143143
- name: Cache XCFrameworks
144-
uses: actions/cache@v2
144+
uses: actions/cache@v4
145145
with:
146146
path: Modules/@babylonjs/react-native-iosandroid/ios/libs
147147
key: ${{ runner.os }}-xcframeworks-${{ github.sha }}
@@ -188,106 +188,107 @@ jobs:
188188
env:
189189
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
190190

191-
build-windows:
192-
runs-on: windows-2019
193-
strategy:
194-
matrix:
195-
platform: [x86, x64, ARM64]
196-
config: [Debug, Release]
197-
steps:
198-
- name: Support longpaths
199-
run: git config --system core.longpaths true
200-
- name: Checkout Repo
201-
uses: actions/[email protected]
202-
with:
203-
submodules: 'true'
204-
- name: Setup MSBuild
205-
uses: microsoft/[email protected]
206-
- name: Setup Node 16
207-
uses: actions/setup-node@v3
208-
with:
209-
node-version: 16
210-
- name: Setup NuGet
211-
uses: nuget/setup-nuget@v1
212-
with:
213-
nuget-version: '5.x'
214-
- name: NPM Install (Playground)
215-
run: npm install
216-
working-directory: ./Apps/Playground
217-
- name: NPM Install (React Native ${{ env.BRN_Version }})
218-
run: npm run select ${{ env.BRN_Version }}
219-
working-directory: ./Apps/Playground
220-
- name: NPM Install (Binary Package)
221-
run: npm install
222-
working-directory: ./Package
223-
- name: Gulp Setup Project ${{ matrix.platform }} (Windows)
224-
run: npx gulp makeUWPProject${{ matrix.platform }}
225-
working-directory: ./Package
226-
- name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows)
227-
run: npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }}
228-
working-directory: ./Package
229-
- name: Gulp NuGet Restore Playground
230-
run: npx gulp nugetRestoreUWPPlayground
231-
working-directory: ./Package
232-
- name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows)
233-
run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }}
234-
working-directory: ./Package
191+
# build-windows:
192+
# runs-on: windows-latest
193+
# strategy:
194+
# matrix:
195+
# platform: [x86, x64, ARM64]
196+
# config: [Debug, Release]
197+
# steps:
198+
# - name: Support longpaths
199+
# run: git config --system core.longpaths true
200+
# - name: Checkout Repo
201+
# uses: actions/[email protected]
202+
# with:
203+
# submodules: 'true'
204+
# - name: Setup MSBuild
205+
# uses: microsoft/[email protected]
206+
# - name: Setup Node 16
207+
# uses: actions/setup-node@v3
208+
# with:
209+
# node-version: 16
210+
# - name: Setup NuGet
211+
# uses: nuget/setup-nuget@v1
212+
# with:
213+
# nuget-version: '5.x'
214+
# - name: NPM Install (Playground)
215+
# run: npm install
216+
# working-directory: ./Apps/Playground
217+
# - name: NPM Install (React Native ${{ env.BRN_Version }})
218+
# run: npm run select ${{ env.BRN_Version }}
219+
# working-directory: ./Apps/Playground
220+
# - name: NPM Install (Binary Package)
221+
# run: npm install
222+
# working-directory: ./Package
223+
# - name: Gulp Setup Project ${{ matrix.platform }} (Windows)
224+
# run: npx gulp makeUWPProject${{ matrix.platform }}
225+
# working-directory: ./Package
226+
# - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} (Windows)
227+
# run: |
228+
# npx gulp buildUWP${{ matrix.platform }}${{ matrix.config }}
229+
# working-directory: ./Package
230+
# - name: Gulp NuGet Restore Playground
231+
# run: npx gulp nugetRestoreUWPPlayground
232+
# working-directory: ./Package
233+
# - name: Gulp Build ${{ matrix.platform }} ${{ matrix.config }} Playground (Windows)
234+
# run: npx gulp buildUWPPlayground${{ matrix.platform }}${{ matrix.config }}
235+
# working-directory: ./Package
235236

236-
build-windows-rnta:
237-
runs-on: windows-2019
238-
steps:
239-
- name: Support longpaths
240-
run: git config --system core.longpaths true
241-
- name: Checkout Repo
242-
uses: actions/[email protected]
243-
with:
244-
submodules: 'true'
245-
- name: Setup MSBuild
246-
uses: microsoft/[email protected]
247-
- name: Setup Node 20
248-
uses: actions/setup-node@v3
249-
with:
250-
node-version: 20
237+
# build-windows-rnta:
238+
# runs-on: windows-latest
239+
# steps:
240+
# - name: Support longpaths
241+
# run: git config --system core.longpaths true
242+
# - name: Checkout Repo
243+
# uses: actions/[email protected]
244+
# with:
245+
# submodules: 'true'
246+
# - name: Setup MSBuild
247+
# uses: microsoft/[email protected]
248+
# - name: Setup Node 20
249+
# uses: actions/setup-node@v3
250+
# with:
251+
# node-version: 20
251252

252-
- name: Install watchman
253-
run: choco install watchman
254-
working-directory: ./Apps/BRNPlayground
253+
# - name: Install watchman
254+
# run: choco install watchman
255+
# working-directory: ./Apps/BRNPlayground
255256

256-
- name: NPM Install RNTA
257-
run: npm install
258-
working-directory: ./Apps/BRNPlayground
257+
# - name: NPM Install RNTA
258+
# run: npm install
259+
# working-directory: ./Apps/BRNPlayground
259260

260-
- name: Build Windows Bundle
261-
run: npm run build:windows
262-
working-directory: ./Apps/BRNPlayground
261+
# - name: Build Windows Bundle
262+
# run: npm run build:windows
263+
# working-directory: ./Apps/BRNPlayground
263264

264-
- name: NPM Install Package
265-
run: npm install
266-
working-directory: ./Package
265+
# - name: NPM Install Package
266+
# run: npm install
267+
# working-directory: ./Package
267268

268-
- name: NPM Generate Windows Project
269-
run: npx install-windows-test-app
270-
working-directory: ./Apps/BRNPlayground
269+
# - name: NPM Generate Windows Project
270+
# run: npx install-windows-test-app
271+
# working-directory: ./Apps/BRNPlayground
271272

272-
- name: BabylonNative build directory
273-
run: mkdir @babylonjs/react-native/Build/uwp_x64
274-
working-directory: ./Modules
273+
# - name: BabylonNative build directory
274+
# run: mkdir @babylonjs/react-native/Build/uwp_x64
275+
# working-directory: ./Modules
275276

276-
- name: CMake BabylonNative
277-
run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows
278-
working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
277+
# - name: CMake BabylonNative
278+
# run: cmake -G "Visual Studio 17 2022" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows
279+
# working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
279280

280-
- name: Nuget restore
281-
run: nuget restore BRNPlayground.sln
282-
working-directory: ./Apps/BRNPlayground/windows
281+
# - name: Nuget restore
282+
# run: nuget restore BRNPlayground.sln
283+
# working-directory: ./Apps/BRNPlayground/windows
283284

284-
- name: Windows build BN
285-
run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m ReactNativeBabylon.sln
286-
working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
285+
# - name: Windows build BN
286+
# run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m ReactNativeBabylon.sln
287+
# working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
287288

288-
- name: Windows build BRN
289-
run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln
290-
working-directory: ./Apps/BRNPlayground/windows
289+
# - name: Windows build BRN
290+
# run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m BRNPlayground.sln
291+
# working-directory: ./Apps/BRNPlayground/windows
291292

292293
# Test packages
293294
build-android-ios-065:
@@ -314,29 +315,29 @@ jobs:
314315
react-native-version: '0.71'
315316
release-version: 0.0.${GITHUB_SHA::8}
316317

317-
build-windows-065:
318-
uses: ./.github/workflows/windows.yml
319-
with:
320-
react-native-version: '0.65'
321-
release-version: 0.0.${GITHUB_SHA::8}
318+
# build-windows-065:
319+
# uses: ./.github/workflows/windows.yml
320+
# with:
321+
# react-native-version: '0.65'
322+
# release-version: 0.0.${GITHUB_SHA::8}
322323

323-
build-windows-069:
324-
uses: ./.github/workflows/windows.yml
325-
with:
326-
react-native-version: '0.69'
327-
release-version: 0.0.${GITHUB_SHA::8}
324+
# build-windows-069:
325+
# uses: ./.github/workflows/windows.yml
326+
# with:
327+
# react-native-version: '0.69'
328+
# release-version: 0.0.${GITHUB_SHA::8}
328329

329-
build-windows-070:
330-
uses: ./.github/workflows/windows.yml
331-
with:
332-
react-native-version: '0.70'
333-
release-version: 0.0.${GITHUB_SHA::8}
330+
# build-windows-070:
331+
# uses: ./.github/workflows/windows.yml
332+
# with:
333+
# react-native-version: '0.70'
334+
# release-version: 0.0.${GITHUB_SHA::8}
334335

335-
build-windows-071:
336-
uses: ./.github/workflows/windows.yml
337-
with:
338-
react-native-version: '0.71'
339-
release-version: 0.0.${GITHUB_SHA::8}
336+
# build-windows-071:
337+
# uses: ./.github/workflows/windows.yml
338+
# with:
339+
# react-native-version: '0.71'
340+
# release-version: 0.0.${GITHUB_SHA::8}
340341

341342
build-typescript:
342343
uses: ./.github/workflows/typescript.yml

0 commit comments

Comments
 (0)