Skip to content

Commit f68318e

Browse files
CedricGuillemetCedricGuillemet
committed
Merge branch 'NewNPM' of https://github.com/CedricGuillemet/BabylonReactNative-1 into NewNPM
2 parents 73570f6 + aee2190 commit f68318e

File tree

20 files changed

+159
-474
lines changed

20 files changed

+159
-474
lines changed

‎.github/workflows/bn_master_commit.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: macos-latest
1414
steps:
1515
- name: Checkout Repo
16-
uses: actions/checkout@v2.3.3
16+
uses: actions/checkout@v4.2.2
1717
with:
1818
submodules: 'recursive'
1919
- name: Setup Node 18
@@ -24,8 +24,6 @@ jobs:
2424
uses: jwlawson/actions-setup-cmake@v1.8
2525
with:
2626
cmake-version: '3.30.3'
27-
- name: Setup Ninja
28-
run: brew install ninja
2927
- name: NPM Install (Playground)
3028
run: npm install
3129
working-directory: ./Apps/Playground
@@ -52,7 +50,7 @@ jobs:
5250
runs-on: macos-latest
5351
steps:
5452
- name: Checkout Repo
55-
uses: actions/checkout@v2.3.3
53+
uses: actions/checkout@v4.2.2
5654
with:
5755
submodules: 'recursive'
5856
- name: Setup Node 18
@@ -74,14 +72,14 @@ jobs:
7472

7573
build-windows:
7674
name: Build Windows ${{ matrix.platform }} ${{ matrix.config }} - BabylonNative ${{ github.event.client_payload.sha }}
77-
runs-on: windows-2019
75+
runs-on: windows-latest
7876
strategy:
7977
matrix:
8078
platform: [x86, x64, ARM64]
8179
config: [Debug, Release]
8280
steps:
8381
- name: Checkout Repo
84-
uses: actions/checkout@v2.3.3
82+
uses: actions/checkout@v4.2.2
8583
with:
8684
submodules: 'true'
8785
- name: Setup MSBuild

‎.github/workflows/ios_android.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: macos-latest
1919
steps:
2020
- name: Checkout Repo
21-
uses: actions/checkout@v2.3.3
21+
uses: actions/checkout@v4.2.2
2222
with:
2323
submodules: 'recursive'
2424
- name: Setup Node 18
@@ -29,8 +29,6 @@ jobs:
2929
uses: jwlawson/actions-setup-cmake@v1.8
3030
with:
3131
cmake-version: '3.30.3'
32-
- name: Setup Ninja
33-
run: brew install ninja
3432
- name: 'Select XCode ${{ inputs.xcode-version }}'
3533
run: sudo xcode-select --switch /Applications/Xcode_${{ inputs.xcode-version }}.app/Contents/Developer
3634
- name: Setup Java

‎.github/workflows/pr.yml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,13 @@ jobs:
99
runs-on: macos-latest
1010
steps:
1111
- name: Checkout Repo
12-
uses: actions/checkout@v2.3.3
12+
uses: actions/checkout@v4.2.2
1313
with:
1414
submodules: 'recursive'
1515
- name: Setup CMake
1616
uses: jwlawson/actions-setup-cmake@v1.8
1717
with:
1818
cmake-version: '3.30.3'
19-
- name: Setup Ninja
20-
run: brew install ninja
2119
- name: Setup Watchman
2220
run: brew install watchman
2321
- name: NPM Install (Binary Package)
@@ -50,7 +48,7 @@ jobs:
5048
runs-on: macos-latest
5149
steps:
5250
- name: Checkout Repo
53-
uses: actions/checkout@v2.3.3
51+
uses: actions/checkout@v4.2.2
5452
with:
5553
submodules: 'recursive'
5654
- name: Setup Watchman
@@ -75,12 +73,12 @@ jobs:
7573
working-directory: ./Package
7674

7775
build-windows:
78-
runs-on: windows-2019
76+
runs-on: windows-latest
7977
steps:
8078
- name: Support longpaths
8179
run: git config --system core.longpaths true
8280
- name: Checkout Repo
83-
uses: actions/checkout@v2.3.3
81+
uses: actions/checkout@v4.2.2
8482
with:
8583
submodules: 'true'
8684
- name: Setup MSBuild
@@ -113,13 +111,13 @@ jobs:
113111
run: npx install-windows-test-app
114112
working-directory: ./Apps/Playground
115113

116-
- name: BabylonNative build directory
117-
run: mkdir @babylonjs/react-native/Build/uwp_x64
118-
working-directory: ./Modules
114+
# - name: BabylonNative build directory
115+
# run: mkdir @babylonjs/react-native/Build/uwp_x64
116+
# working-directory: ./Modules
119117

120-
- name: CMake BabylonNative
121-
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
122-
working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
118+
# - name: CMake BabylonNative
119+
# 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
120+
# working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
123121

124122
- name: Nuget restore
125123
run: nuget restore Playground.sln
@@ -129,9 +127,9 @@ jobs:
129127
# run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m ReactNativeBabylon.sln
130128
# working-directory: ./Modules/@babylonjs/react-native/Build/uwp_x64
131129

132-
# - name: Windows build BRN
133-
# run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m Playground.sln
134-
# working-directory: ./Apps/Playground/windows
130+
- name: Windows build Playground
131+
run: MSBuild /p:Platform="x64" /p:Configuration="Release" /p:WindowsTargetPlatformVersion=10.0.19041.0 /m Playground.sln
132+
working-directory: ./Apps/Playground/windows
135133

136134
build-typescript:
137135
uses: ./.github/workflows/typescript.yml
@@ -143,7 +141,7 @@ jobs:
143141
runs-on: macos-latest
144142
steps:
145143
- name: Checkout Repo
146-
uses: actions/checkout@v2.3.3
144+
uses: actions/checkout@v4.2.2
147145
- name: NPM Install (Binary Package)
148146
run: npm install
149147
working-directory: ./Package

‎.github/workflows/publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
runs-on: macos-latest
7474
steps:
7575
- name: Checkout Repo
76-
uses: actions/checkout@v2.3.3
76+
uses: actions/checkout@v4.2.2
7777
- name: NPM Install (Binary Package)
7878
run: npm install
7979
working-directory: ./Package

‎.github/workflows/publish_preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
runs-on: macos-latest
9090
steps:
9191
- name: Checkout Repo
92-
uses: actions/checkout@v2.3.3
92+
uses: actions/checkout@v4.2.2
9393
- name: NPM Install (Binary Package)
9494
run: npm install
9595
working-directory: ./Package

‎.github/workflows/test_version.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: windows-2019
3434
steps:
3535
- name: Checkout Repo
36-
uses: actions/checkout@v2.3.3
36+
uses: actions/checkout@v4.2.2
3737
- name: Setup MSBuild
3838
uses: microsoft/setup-msbuild@v1.0.2
3939
- name: Setup Node ${{ github.event.inputs.Node_Version }}
@@ -66,7 +66,7 @@ jobs:
6666
runs-on: ubuntu-latest
6767
steps:
6868
- name: Checkout Repo
69-
uses: actions/checkout@v2.3.3
69+
uses: actions/checkout@v4.2.2
7070
- name: Setup Node ${{ github.event.inputs.Node_Version }}
7171
uses: actions/setup-node@v3
7272
with:
@@ -103,7 +103,7 @@ jobs:
103103
runs-on: macos-12
104104
steps:
105105
- name: Checkout Repo
106-
uses: actions/checkout@v2.3.3
106+
uses: actions/checkout@v4.2.2
107107
- name: Clone iOS Toolchain
108108
run: |
109109
git clone https://github.com/leetal/ios-cmake.git
@@ -138,7 +138,7 @@ jobs:
138138
runs-on: ubuntu-latest
139139
steps:
140140
- name: Checkout Repo
141-
uses: actions/checkout@v2.3.3
141+
uses: actions/checkout@v4.2.2
142142
- name: Setup Node ${{ github.event.inputs.Node_Version }}
143143
uses: actions/setup-node@v3
144144
with:
@@ -173,7 +173,7 @@ jobs:
173173
runs-on: macos-12
174174
steps:
175175
- name: Checkout Repo
176-
uses: actions/checkout@v2.3.3
176+
uses: actions/checkout@v4.2.2
177177
- name: Clone iOS Toolchain
178178
run: |
179179
git clone https://github.com/leetal/ios-cmake.git

‎.github/workflows/typescript.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: macos-latest
1212
steps:
1313
- name: Checkout Repo
14-
uses: actions/checkout@v2.3.3
14+
uses: actions/checkout@v4.2.2
1515
with:
1616
submodules: 'recursive'
1717
- name: Setup Node 18

‎.github/workflows/windows.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ on:
1212

1313
jobs:
1414
Build:
15-
runs-on: windows-2019
15+
runs-on: windows-latest
1616
steps:
1717
- name: Checkout Repo
18-
uses: actions/checkout@v2.3.3
18+
uses: actions/checkout@v4.2.2
1919
with:
2020
submodules: 'true'
2121
- name: Setup MSBuild

‎Modules/@babylonjs/react-native/.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,5 @@ ReactNativeBabylon.xcodeproj
5454
*.tgz
5555
jsi
5656

57-
shared/BabylonNative
57+
shared/BabylonNative
58+
Build_uwp*/

‎Modules/@babylonjs/react-native/react-native-babylon.podspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package = JSON.parse(File.read(File.join(__dir__, "package.json")))
55
# This Podspec is used for local development
66

77
base_base_path = '$(PODS_ROOT)/../../../../Modules/@babylonjs/Build/iOS'
8-
babylon_base_path = "#{base_base_path}/shared/BabylonNative/BabylonNative-a736d2d675c4733e70186237d39412f187139b48"
8+
babylon_base_path = "#{base_base_path}/shared/BabylonNative/Repo"
99

1010
Pod::Spec.new do |s|
1111
s.name = "react-native-babylon"

0 commit comments

Comments
 (0)