Skip to content

Commit 4b0b399

Browse files
CedricGuillemetCedricGuillemet
committed
brings back rnta
1 parent 43ad6c0 commit 4b0b399

File tree

2 files changed

+71
-69
lines changed

2 files changed

+71
-69
lines changed

‎.github/workflows/pr.yml

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -47,45 +47,45 @@ jobs:
4747
env:
4848
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
4949

50-
# build-android-rnta:
51-
# runs-on: macos-latest
52-
# steps:
53-
# - name: Checkout Repo
54-
# uses: actions/[email protected]
55-
# with:
56-
# submodules: 'recursive'
57-
# - name: Free space
58-
# uses: ./.github/workflows/macos_freespace
59-
# - name: Setup CMake
60-
# uses: jwlawson/[email protected]
61-
# with:
62-
# cmake-version: '3.26.3'
63-
# - name: Setup Ninja
64-
# run: brew install ninja
65-
# - name: Setup Watchman
66-
# run: brew install watchman
67-
# - name: NPM Install (Playground)
68-
# run: npm install
69-
# working-directory: ./Apps/BRNPlayground
50+
build-android-rnta:
51+
runs-on: macos-latest
52+
steps:
53+
- name: Checkout Repo
54+
uses: actions/[email protected]
55+
with:
56+
submodules: 'recursive'
57+
- name: Free space
58+
uses: ./.github/workflows/macos_freespace
59+
- name: Setup CMake
60+
uses: jwlawson/[email protected]
61+
with:
62+
cmake-version: '3.26.3'
63+
- name: Setup Ninja
64+
run: brew install ninja
65+
- name: Setup Watchman
66+
run: brew install watchman
67+
- name: NPM Install (Playground)
68+
run: npm install
69+
working-directory: ./Apps/BRNPlayground
7070

71-
# - name: Build Windows Bundle
72-
# run: npm run build:android
73-
# working-directory: ./Apps/BRNPlayground
71+
- name: Build Windows Bundle
72+
run: npm run build:android
73+
working-directory: ./Apps/BRNPlayground
7474

75-
# - name: NPM Install (Binary Package)
76-
# run: npm install
77-
# working-directory: ./Package
78-
# - name: Setup Java
79-
# uses: actions/setup-java@v3
80-
# with:
81-
# distribution: 'temurin'
82-
# java-version: '17'
83-
# check-latest: true
84-
# - name: Gulp (Android)
85-
# run: npx gulp buildAndroidRNTA
86-
# working-directory: ./Package
87-
# env:
88-
# JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
75+
- name: NPM Install (Binary Package)
76+
run: npm install
77+
working-directory: ./Package
78+
- name: Setup Java
79+
uses: actions/setup-java@v3
80+
with:
81+
distribution: 'temurin'
82+
java-version: '17'
83+
check-latest: true
84+
- name: Gulp (Android)
85+
run: npx gulp buildAndroidRNTA
86+
working-directory: ./Package
87+
env:
88+
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
8989

9090
build-iOS:
9191
runs-on: macos-latest
@@ -113,40 +113,40 @@ jobs:
113113
run: npx gulp buildIOS
114114
working-directory: ./Package
115115

116-
# build-iOS-rnta:
117-
# runs-on: macos-latest
118-
# steps:
119-
# - name: Checkout Repo
120-
# uses: actions/[email protected]
121-
# with:
122-
# submodules: 'recursive'
123-
# - name: Free space
124-
# uses: ./.github/workflows/macos_freespace
125-
# - name: Setup Watchman
126-
# run: brew install watchman
116+
build-iOS-rnta:
117+
runs-on: macos-latest
118+
steps:
119+
- name: Checkout Repo
120+
uses: actions/[email protected]
121+
with:
122+
submodules: 'recursive'
123+
- name: Free space
124+
uses: ./.github/workflows/macos_freespace
125+
- name: Setup Watchman
126+
run: brew install watchman
127127

128-
# - name: NPM Install (Playground)
129-
# run: npm install
130-
# working-directory: ./Apps/BRNPlayground
128+
- name: NPM Install (Playground)
129+
run: npm install
130+
working-directory: ./Apps/BRNPlayground
131131

132-
# - name: Build iOS Bundle
133-
# run: npm run build:ios
134-
# working-directory: ./Apps/BRNPlayground
132+
- name: Build iOS Bundle
133+
run: npm run build:ios
134+
working-directory: ./Apps/BRNPlayground
135135

136-
# - name: NPM Install (Binary Package)
137-
# run: npm install
138-
# working-directory: ./Package
139-
# - name: Gulp (iOS)
140-
# run: npx gulp buildIOSRNTA
141-
# working-directory: ./Package
136+
- name: NPM Install (Binary Package)
137+
run: npm install
138+
working-directory: ./Package
139+
- name: Gulp (iOS)
140+
run: npx gulp buildIOSRNTA
141+
working-directory: ./Package
142142

143-
# - name: Cache XCFrameworks
144-
# uses: actions/cache@v2
145-
# with:
146-
# path: Modules/@babylonjs/react-native-iosandroid/ios/libs
147-
# key: ${{ runner.os }}-xcframeworks-${{ github.sha }}
148-
# restore-keys: |
149-
# ${{ runner.os }}-xcframeworks
143+
- name: Cache XCFrameworks
144+
uses: actions/cache@v2
145+
with:
146+
path: Modules/@babylonjs/react-native-iosandroid/ios/libs
147+
key: ${{ runner.os }}-xcframeworks-${{ github.sha }}
148+
restore-keys: |
149+
${{ runner.os }}-xcframeworks
150150
151151
test-publish-android-ios:
152152
runs-on: macos-latest

‎Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,10 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/src/")
3838
set(BABYLON_NATIVE_BUILD_APPS OFF CACHE BOOL "")
3939
add_subdirectory(${babylonnative_SOURCE_DIR} ${babylonnative_SOURCE_DIR}/build/Android_${CMAKE_ANDROID_ARCH_ABI}/)
4040

41-
disable_warnings(NativeXr)
42-
disable_warnings(NativeCamera)
41+
if (NOT ${BASEKIT_BUILD})
42+
disable_warnings(NativeXr)
43+
disable_warnings(NativeCamera)
44+
endif()
4345
disable_warnings(XMLHttpRequest)
4446
disable_warnings(Graphics)
4547
disable_warnings(NativeEngine)

0 commit comments

Comments
 (0)