Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,26 @@ jobs:
- name: Gulp (iOS)
run: npx gulp buildIOS
working-directory: ./Package

build-windows:
runs-on: windows-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2.3.3
with:
submodules: 'true'
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.0.2
- name: Setup NuGet
uses: nuget/setup-nuget@v1
with:
nuget-version: '5.x'
- name: NPM Install (Playground)
run: npm install
working-directory: ./Apps/Playground
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Gulp (Windows)
run: npx gulp buildUWPPR
working-directory: ./Package
52 changes: 50 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [published]

jobs:
build:
build-android-ios:
runs-on: macos-latest
steps:
- name: Checkout Repo
Expand All @@ -22,6 +22,54 @@ jobs:
- name: Gulp
run: npx gulp
working-directory: ./Package
- name: Upload Assembled Folder
uses: actions/upload-artifact@v2
with:
name: 'Assembled'
path: Package/Assembled
build-windows:
runs-on: windows-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2.3.3
with:
submodules: 'true'
- name: Setup MSBuild
uses: microsoft/setup-msbuild@v1.0.2
- name: Setup NuGet
uses: nuget/setup-nuget@v1
with:
nuget-version: '5.x'
- name: NPM Install (Playground)
run: npm install
working-directory: ./Apps/Playground
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Gulp (Windows)
run: npx gulp buildUWPPublish
working-directory: ./Package
- name: Upload Assembled Folder
uses: actions/upload-artifact@v2
with:
name: 'Assembled'
path: Package/Assembled
package:
needs: [build-android-ios, build-windows]
runs-on: macos-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v2.3.3
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Download Assembled Folder
uses: actions/download-artifact@v2
with:
name: 'Assembled'
path: Package/Assembled
- name: Display structure of downloaded Assembled folder
run: ls -R
- name: Setup Node.js
uses: actions/setup-node@v2.1.2
with:
Expand All @@ -34,4 +82,4 @@ jobs:
npm publish --access public
working-directory: ./Package/Assembled
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
5 changes: 5 additions & 0 deletions Modules/@babylonjs/react-native/windows/scripts/PRBuild.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Import-Module $PSScriptRoot\Utils.psm1

Compile-Solution -Platform "x64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\submodules\BabylonNative\Build_uwp_x64\ReactNativeBabylon.sln"
nuget restore "$PSScriptRoot\..\..\..\..\..\Apps\Playground\windows\Playground.sln"
Compile-Solution -Platform "x64" -Configuration "Debug" -Solution "$PSScriptRoot\..\..\..\..\..\Apps\Playground\windows\Playground.sln"
6 changes: 0 additions & 6 deletions Modules/@babylonjs/react-native/windows/scripts/Setup.ps1

This file was deleted.

8 changes: 7 additions & 1 deletion Modules/@babylonjs/react-native/windows/scripts/Utils.psm1
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# MSBuild lookup adapted from https://blog.lextudio.com/locate-msbuild-via-powershell-on-different-operating-systems-140757bb8e18
function Get-MSBuildPath {
$msbuild = ""
$MSBuildExistsInPath = $null -ne (Get-Command "msbuild" -ErrorAction SilentlyContinue)
if ($MSBuildExistsInPath) {
$msbuild = "msbuild.exe"
return $msbuild
}

if (-not(Get-PackageProvider NuGet -ErrorAction silentlyContinue)) {
Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Confirm:$False -Force
}
Expand Down Expand Up @@ -63,7 +69,7 @@ function Compile-Solution {
)

$MSBuild = Get-MSBuildPath
& "$MSBuild" /p:Configuration="$Configuration" /p:Platform="$Platform" $Solution
& "$MSBuild" /p:Configuration="$Configuration" /p:Platform="$Platform" /m $Solution
if ($? -Eq $False) {
Write-Error "$Platform $Configuration Build failed."
exit 1
Expand Down
38 changes: 35 additions & 3 deletions Package/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,17 @@ const buildAndroid = async () => {
};

const makeUWPProject = async () => {
exec('.\\..\\Modules\\@babylonjs\\react-native\\windows\\scripts\\Setup.bat');
// windows build agents don't support the path lengths required for initializing arcore dependencies,
// so we manually initialize the submodules we need here.
exec('git -c submodule."Dependencies/xr/Dependencies/arcore-android-sdk".update=none submodule update --init --recursive "./../Modules/@babylonjs/react-native/submodules/BabylonNative');
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64');
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI ./../../../windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64');
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x86');
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A Win32 ./../../../windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x86');
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm');
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A arm ./../../../windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm');
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm64');
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI -A arm64 ./../../../windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_arm64');
}

const buildUWPProject = async () => {
Expand All @@ -51,6 +61,20 @@ const buildUWPProject = async () => {

const buildUWP = gulp.series(makeUWPProject, buildUWPProject);

const makeUWPProjectPR = async () => {
// windows build agents don't support the path lengths required for initializing arcore dependencies,
// so we manually initialize the submodules we need here.
exec('git -c submodule."Dependencies/xr/Dependencies/arcore-android-sdk".update=none submodule update --init --recursive "./../Modules/@babylonjs/react-native/submodules/BabylonNative');
shelljs.mkdir('-p', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64');
exec('cmake -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -D NAPI_JAVASCRIPT_ENGINE=JSI ./../../../windows', './../Modules/@babylonjs/react-native/submodules/BabylonNative/Build_uwp_x64');
}

const buildUWPProjectPR = async () => {
exec('.\\..\\Modules\\@babylonjs\\react-native\\windows\\scripts\\PRBuild.bat');
}

const buildUWPPR = gulp.series(makeUWPProjectPR, buildUWPProjectPR);

const copyCommonFiles = () => {
return gulp.src('../Apps/Playground/node_modules/@babylonjs/react-native/package.json')
.pipe(gulp.src('../Apps/Playground/node_modules/@babylonjs/react-native/README.md'))
Expand Down Expand Up @@ -283,10 +307,18 @@ exports.build = build;
exports.rebuild = rebuild;
exports.pack = pack;

const packUWP = gulp.series(clean, buildUWP, copyCommonFiles, copySharedFiles, copyUWPFiles, createPackage);
const packUWPNoBuild = gulp.series(clean, copyCommonFiles, copySharedFiles, copyUWPFiles, createPackage);
const copyPackageFilesUWP = gulp.series(copyCommonFiles, copySharedFiles, copyUWPFiles);
const buildUWPPublish = gulp.series(buildUWP, copyPackageFilesUWP);
const packUWP = gulp.series(clean, buildUWP, copyPackageFilesUWP, createPackage);
const packUWPNoBuild = gulp.series(clean, copyPackageFilesUWP, createPackage);

exports.makeUWPProject = makeUWPProject;
exports.buildUWPProject = buildUWPProject;
exports.makeUWPProjectPR = makeUWPProjectPR;
exports.buildUWPProjectPR = buildUWPProjectPR;
exports.buildUWP = buildUWP;
exports.buildUWPPR = buildUWPPR;
exports.buildUWPPublish = buildUWPPublish;
exports.copyUWPFiles = copyUWPFiles;
exports.packUWP = packUWP;
exports.packUWPNoBuild = packUWPNoBuild;
Expand Down
122 changes: 110 additions & 12 deletions Package/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading