Update babylonnative and use babylonnative commit sha for ci builds (#209)

* add some different definitions

* change checkout process and steps

* update gulp file

* update job

* update to master

* use specific commit

* try again

* add merge to submodule update

* try changing repo for help merging

* fix submodule initialization

* avoid changing repo

* fix name

Co-authored-by: rgerd <[email protected]>

Author: C. M. Barth

.github/workflows/bn_master_commit.yml

@@ -6,6 +6,7 @@ on:
 
 jobs:
   build-android:
+    name: Build Android - BabylonNative ${{ github.event.client_payload.sha }}
     runs-on: macos-latest
     steps:
       - name: Checkout Repo
@@ -24,14 +25,15 @@ jobs:
       - name: NPM Install (Binary Package)
         run: npm install
         working-directory: ./Package
-      - name: Git (Update to BabylonNative master)
-        run: npx gulp initializeSubmodulesMostRecentBabylonNative
+      - name: Git (Update to BabylonNative ${{ github.event.client_payload.sha }})
+        run: npx gulp initializeSubmodulesMostRecentBabylonNative --sha ${{ github.event.client_payload.sha }}
         working-directory: ./Package
       - name: Gulp (Android)
         run: npx gulp buildAndroid
         working-directory: ./Package
 
   build-iOS:
+    name: Build iOS - BabylonNative ${{ github.event.client_payload.sha }}
     runs-on: macos-latest
     steps:
       - name: Checkout Repo
@@ -44,14 +46,15 @@ jobs:
       - name: NPM Install (Binary Package)
         run: npm install
         working-directory: ./Package
-      - name: Git (Update to BabylonNative master)
-        run: npx gulp initializeSubmodulesMostRecentBabylonNative
+      - name: Git (Update to BabylonNative ${{ github.event.client_payload.sha }})
+        run: npx gulp initializeSubmodulesMostRecentBabylonNative --sha ${{ github.event.client_payload.sha }}
         working-directory: ./Package
       - name: Gulp (iOS)
         run: npx gulp buildIOS
         working-directory: ./Package
 
   build-windows:
+    name: Build Windows ${{ matrix.platform }} ${{ matrix.config }} - BabylonNative ${{ github.event.client_payload.sha }}
     runs-on: windows-latest
     strategy:
       matrix:
@@ -74,8 +77,8 @@ jobs:
       - name: NPM Install (Binary Package)
         run: npm install
         working-directory: ./Package
-      - name: Git (Update to BabylonNative master)
-        run: npx gulp initializeSubmodulesMostRecentBabylonNativeWindowsAgent
+      - name: Git (Update to BabylonNative ${{ github.event.client_payload.sha }})
+        run: npx gulp initializeSubmodulesMostRecentBabylonNative --sha ${{ github.event.client_payload.sha }} --windows
         working-directory: ./Package
       - name: Gulp Setup Project ${{ matrix.platform }} (Windows)
         run: npx gulp makeUWPProject${{ matrix.platform }}

Modules/@babylonjs/react-native/submodules/BabylonNative

@@ -53,23 +53,39 @@ const initializeSubmodulesWindowsAgent = async () => {
 }
 
 const initializeSubmodulesMostRecentBabylonNative = async () => {
-  exec('git submodule init ./../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git fetch origin master', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git checkout origin/master', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git rev-parse HEAD', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git submodule update --init --recursive *', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git rev-parse HEAD', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-}
-
-const initializeSubmodulesMostRecentBabylonNativeWindowsAgent = async () => {
-  exec('git submodule init ./../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git fetch origin master', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git checkout origin/master', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git add ./../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git commit -m "update to master"');
-  exec('git rev-parse HEAD', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git -c submodule."Dependencies/xr/Dependencies/arcore-android-sdk".update=none submodule update --init --recursive "./../Modules/@babylonjs/react-native/submodules/BabylonNative');
-  exec('git rev-parse HEAD', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
+  let shaFound = false;
+  const shaOptionIndex = process.argv.indexOf('--sha');
+  if (shaOptionIndex >= 0)
+  {
+    const shaIndex = shaOptionIndex + 1;
+    if (process.argv.length > shaIndex)
+    {
+      shaFound = true;
+      const sha = process.argv[shaIndex];
+      console.log("Using provided commit: " + sha);
+      exec('git submodule init ./../Modules/@babylonjs/react-native/submodules/BabylonNative');
+      exec('git fetch origin ' + sha, './../Modules/@babylonjs/react-native/submodules/BabylonNative');
+      exec('git checkout ' + sha, './../Modules/@babylonjs/react-native/submodules/BabylonNative');
+    }
+  }
+
+  if (!shaFound)
+  {
+    exec('git submodule init ./../Modules/@babylonjs/react-native/submodules/BabylonNative');
+    exec('git fetch origin master', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
+    exec('git checkout origin/master', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
+  }
+
+  if (process.argv.indexOf('--windows') >= 0)
+  {
+    exec('git -c submodule."Dependencies/xr/Dependencies/arcore-android-sdk".update=none submodule update --init --recursive *', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
+  }
+  else
+  {
+    exec('git submodule update --init --recursive *', './../Modules/@babylonjs/react-native/submodules/BabylonNative');
+  }
+
+  exec('git status');
 }
 
 const makeUWPProjectx86 = async () => {
@@ -520,6 +536,5 @@ exports.packUWP = packUWP;
 exports.packUWPNoBuild = packUWPNoBuild;
 
 exports.initializeSubmodulesMostRecentBabylonNative = initializeSubmodulesMostRecentBabylonNative;
-exports.initializeSubmodulesMostRecentBabylonNativeWindowsAgent = initializeSubmodulesMostRecentBabylonNativeWindowsAgent;
 
 exports.default = build;