From 8fe7b4fcbd730b2c843136a3943175cb9a77e3a2 Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Mon, 7 Jun 2021 09:49:23 -0700 Subject: [PATCH 1/3] add publish test to pr ci, remove arm build to free up agents --- .github/workflows/pr.yml | 25 ++++++++++++++++++++++++- Package/gulpfile.js | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 781572965..e80bf5cb4 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -45,11 +45,34 @@ jobs: run: npx gulp buildIOS working-directory: ./Package + test-publish-android-ios: + runs-on: macos-latest + steps: + - name: Checkout Repo + uses: actions/checkout@v2.3.3 + with: + submodules: 'recursive' + - name: Setup CMake + uses: jwlawson/actions-setup-cmake@v1.8 + with: + cmake-version: '3.19.6' # See https://gitlab.kitware.com/cmake/cmake/-/issues/22021 + - name: Setup Ninja + run: brew install ninja + - name: NPM Install (Playground) + run: npm install + working-directory: ./Apps/Playground + - name: NPM Install (Binary Package) + run: npm install + working-directory: ./Package + - name: Gulp + run: npx gulp + working-directory: ./Package + build-windows: runs-on: windows-latest strategy: matrix: - platform: [x86, x64, ARM, ARM64] + platform: [x86, x64, ARM64] config: [Debug, Release] steps: - name: Checkout Repo diff --git a/Package/gulpfile.js b/Package/gulpfile.js index 6c8d569d5..e1bc7607a 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -395,9 +395,9 @@ const validate = async () => { `Assembled Assembled/EngineHook.ts Assembled/shared -Assembled/shared/BabylonNative.h Assembled/shared/XrContextHelper.h Assembled/shared/XrAnchorHelper.h +Assembled/shared/BabylonNative.h Assembled/EngineView.tsx Assembled/ios Assembled/ios/BabylonNativeInterop.mm From 32a3a2e274bd28689dbdc200a287f7538eb8bfb9 Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Mon, 7 Jun 2021 10:01:38 -0700 Subject: [PATCH 2/3] fix path for copying context header --- Package/gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package/gulpfile.js b/Package/gulpfile.js index e1bc7607a..bfe29bddd 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -246,7 +246,7 @@ const copyAndroidFiles = async () => { }); await new Promise(resolve => { - gulp.src('../Apps/Playground/node_modules/@babylonjs/react-native/submodules/BabylonNative/Dependencies/xr/src/ARCore/Include/*') + gulp.src('../Apps/Playground/node_modules/@babylonjs/react-native/submodules/BabylonNative/Dependencies/xr/Source/ARCore/Include/*') .pipe(gulp.dest('Assembled/android/include')) .on('end', resolve); }) From f0cda0ab451f3f2dacbe981e13c1bf7c210587f3 Mon Sep 17 00:00:00 2001 From: Chris Barth Date: Mon, 7 Jun 2021 10:43:56 -0700 Subject: [PATCH 3/3] fix validate file order --- Package/gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package/gulpfile.js b/Package/gulpfile.js index bfe29bddd..d6108adc1 100644 --- a/Package/gulpfile.js +++ b/Package/gulpfile.js @@ -440,9 +440,9 @@ Assembled/ios/BabylonModule.mm Assembled/README.md Assembled/package.json Assembled/android -Assembled/android/build.gradle Assembled/android/include Assembled/android/include/IXrContextARCore.h +Assembled/android/build.gradle Assembled/android/src Assembled/android/src/main Assembled/android/src/main/AndroidManifest.xml