Skip to content

New package system #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 69 commits into from
Mar 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
673fb99
rename folder/package
CedricGuillemetMS Mar 18, 2022
f309588
split between iosandroid and ts
CedricGuillemetMS Mar 18, 2022
dc7d2d2
gulp with new assembled folder
CedricGuillemetMS Mar 18, 2022
60a3b44
force publish to use 0.64
CedricGuillemetMS Mar 18, 2022
c309d77
path fixing
CedricGuillemetMS Mar 18, 2022
eb626df
fix cmake ios
CedricGuillemetMS Mar 18, 2022
6509917
ios path again
CedricGuillemetMS Mar 18, 2022
c2b37a0
react common path
CedricGuillemetMS Mar 18, 2022
434d4a6
react-native-permissions
CedricGuillemetMS Mar 18, 2022
5a44907
this should fix ios package build
CedricGuillemetMS Mar 18, 2022
7bfb3a0
back to permissions 2.1.4
CedricGuillemetMS Mar 18, 2022
0511660
lipo output path
CedricGuillemetMS Mar 18, 2022
45078d7
checked assembled
CedricGuillemetMS Mar 18, 2022
af9280c
reusable workflows
CedricGuillemetMS Mar 18, 2022
211234e
duplicate name
CedricGuillemetMS Mar 18, 2022
ffcf4a9
Updated windows project settings
SergioRZMasson Mar 18, 2022
e13b9eb
check assembled file list
CedricGuillemetMS Mar 21, 2022
56a88de
Merge pull request #2 from SergioRZMasson/migration/version-windows
CedricGuillemet Mar 21, 2022
b25d91d
test without files check
CedricGuillemetMS Mar 21, 2022
52b7e27
test version patch
CedricGuillemetMS Mar 21, 2022
ca36711
TS/native separation
CedricGuillemetMS Mar 21, 2022
8348a4d
fixed bad job name
CedricGuillemetMS Mar 21, 2022
3a35f64
workflow_call
CedricGuillemetMS Mar 21, 2022
c5d69a9
fix builts
CedricGuillemetMS Mar 21, 2022
2f8489c
tsc
CedricGuillemetMS Mar 21, 2022
7258600
tsc
CedricGuillemetMS Mar 21, 2022
48d56ff
shared folder fix
CedricGuillemetMS Mar 21, 2022
669c9fd
small fixes
CedricGuillemetMS Mar 21, 2022
353ddf5
build ts
CedricGuillemetMS Mar 21, 2022
9728144
local workflow, file list re-enabled
CedricGuillemetMS Mar 22, 2022
e152419
no version for local workflow
CedricGuillemetMS Mar 22, 2022
3297957
validate assembled and iosAndroid
CedricGuillemetMS Mar 22, 2022
098609f
expectedList
CedricGuillemetMS Mar 22, 2022
35b7cb8
readme and file checks
CedricGuillemetMS Mar 22, 2022
15e57b6
copyCommonFiles
CedricGuillemetMS Mar 22, 2022
79573c5
Updated BabylonReactNative.vcxproj to search include headers into @b…
SergioRZMasson Mar 22, 2022
e1194b8
Fixed issue with windows build for package consumption vs repo build
SergioRZMasson Mar 22, 2022
d14b98d
Merge pull request #3 from SergioRZMasson/migration/version-windows
CedricGuillemet Mar 22, 2022
b7013ad
moved shared
CedricGuillemetMS Mar 22, 2022
41a59a8
include path
CedricGuillemetMS Mar 22, 2022
8e7be59
shared for windows
CedricGuillemetMS Mar 22, 2022
bdf39af
shared folder android
CedricGuillemetMS Mar 23, 2022
5b20693
android cmake again
CedricGuillemetMS Mar 23, 2022
8fcf3e0
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
CedricGuillemetMS Mar 23, 2022
3b07521
interop ios shared path
CedricGuillemetMS Mar 23, 2022
34e4ae7
Update Package/gulpfile.js
CedricGuillemet Mar 24, 2022
34b8fe6
PR feedback
CedricGuillemetMS Mar 24, 2022
28e435f
Merge branch 'NewPackageSystem' of https://github.com/CedricGuillemet…
CedricGuillemetMS Mar 24, 2022
8eb3626
check dir displays directory name
CedricGuillemetMS Mar 24, 2022
282fe45
patch react-native package version
CedricGuillemetMS Mar 24, 2022
2eb5a1f
release and version separated
CedricGuillemetMS Mar 24, 2022
11c9521
typo
CedricGuillemetMS Mar 24, 2022
514181f
default RN version for tsc
CedricGuillemetMS Mar 24, 2022
08cc2b2
PR feedback
CedricGuillemetMS Mar 24, 2022
c3078d4
podspec
CedricGuillemetMS Mar 24, 2022
993f5db
package name patching
CedricGuillemetMS Mar 24, 2022
99cd46a
undo unnecessary changes
CedricGuillemetMS Mar 25, 2022
c6d6740
Fix conflicts
CedricGuillemet Mar 28, 2022
a358a85
removed workflow
CedricGuillemet Mar 28, 2022
aa4945b
more conflicts
CedricGuillemet Mar 28, 2022
00ac7f8
submodule fix
CedricGuillemet Mar 28, 2022
54985ce
submodule version
CedricGuillemet Mar 28, 2022
fe362fb
submodule path
CedricGuillemet Mar 28, 2022
94cec35
Removed submodule Modules/@babylonjs/react-native/submodules/BabylonN…
CedricGuillemet Mar 28, 2022
792846d
submodule fix 1
CedricGuillemet Mar 28, 2022
45ea7cf
fix module 2
CedricGuillemet Mar 28, 2022
eaa1978
Removed submodule Modules/@babylonjs/react-native-iosandroid/submodules
CedricGuillemet Mar 28, 2022
2b50cf4
fix submodule
CedricGuillemet Mar 28, 2022
4962f71
cmake variable names
CedricGuillemetMS Mar 29, 2022
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
5 changes: 1 addition & 4 deletions .github/workflows/ios_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
react-native-version:
required: true
type: string
Release_Version:
required: true
type: string

jobs:
Build:
Expand All @@ -34,7 +31,7 @@ jobs:
run: npm install
working-directory: ./Package
- name: Gulp
run: npx gulp --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.Release_Version }}
run: npx gulp --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ github.event.release.name }}
working-directory: ./Package
- name: Upload Assembled iOS Android Folder
uses: actions/upload-artifact@v2
Expand Down
154 changes: 65 additions & 89 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,94 +3,32 @@ on:
release:
types: [published]


jobs:
select-react-native-version:
runs-on: macos-latest
outputs:
version: ${{ steps.stepVersion.outputs.version }}
steps:
- uses: actions-ecosystem/action-regex-match@v2
id: regex-match
with:
text: ${{ github.event.release.name }}
regex: '^(\d+\.)?(\d+)'
- name: Release infos
run: |
echo "- Tag ${GITHUB_REF/refs\/tags\//}"
echo "- Name: ${{ github.event.release.name }}"
echo "- Description: ${{ github.event.release.body }}"
- id: stepVersion
run: echo "::set-output name=version::${{ steps.regex-match.outputs.match }}"
build-android-ios:
runs-on: macos-latest
needs: select-react-native-version
steps:
- name: Checkout Repo
uses: actions/[email protected]
with:
submodules: 'recursive'
- name: Setup CMake
uses: jwlawson/[email protected]
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: Select React Native Version ${{ needs.select-react-native-version.outputs.version }}
run: npm run select --reactNative ${{ needs.select-react-native-version.outputs.version }}
working-directory: ./Apps/Playground
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Gulp
run: npx gulp --reactNative ${{ needs.select-react-native-version.outputs.version }}
working-directory: ./Package
- name: Upload Assembled Folder
uses: actions/upload-artifact@v2
with:
name: 'Assembled'
path: Package/Assembled
build-android-ios-064:
uses: ./.github/workflows/ios_android.yml
with:
react-native-version: 0.64

build-windows:
runs-on: windows-2019
needs: select-react-native-version
steps:
- name: Checkout Repo
uses: actions/[email protected]
with:
submodules: 'true'
- name: Setup MSBuild
uses: microsoft/[email protected]
- 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 (React Native ${{ needs.select-react-native-version.outputs.version }})
run: npm run select --reactNative ${{ needs.select-react-native-version.outputs.version }}
working-directory: ./Apps/Playground
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Git (Windows)
run: npx gulp initializeSubmodulesWindowsAgent --reactNative ${{ needs.select-react-native-version.outputs.version }}
working-directory: ./Package
- name: Gulp (Windows)
run: npx gulp buildUWPPublish
working-directory: ./Package
- name: Upload Assembled-Windows Folder
uses: actions/upload-artifact@v2
with:
name: 'Assembled-Windows'
path: Package/Assembled-Windows
build-android-ios-065:
uses: ./.github/workflows/ios_android.yml
with:
react-native-version: 0.65

build-windows-064:
uses: ./.github/workflows/windows.yml
with:
react-native-version: 0.64

build-windows-065:
uses: ./.github/workflows/windows.yml
with:
react-native-version: 0.65

build-typescript:
uses: ./.github/workflows/typescript.yml

package:
needs: [select-react-native-version, build-android-ios, build-windows]
needs: [build-typescript, build-android-ios-064, build-android-ios-065, build-windows-064, build-windows-065]
runs-on: macos-latest
steps:
- name: Checkout Repo
Expand All @@ -103,11 +41,26 @@ jobs:
with:
name: 'Assembled'
path: Package/Assembled
- name: Download Assembled-Windows Folder
- name: Download Assembled-iOSAndroid 0.64 Folder
uses: actions/download-artifact@v2
with:
name: 'Assembled-iOSAndroid0.64'
path: Package/Assembled-iOSAndroid0.64
- name: Download Assembled-iOSAndroid 0.65 Folder
uses: actions/download-artifact@v2
with:
name: 'Assembled-iOSAndroid0.65'
path: Package/Assembled-iOSAndroid0.65
- name: Download Assembled-Windows 0.64 Folder
uses: actions/download-artifact@v2
with:
name: 'Assembled-Windows'
path: Package/Assembled-Windows
name: 'Assembled-Windows0.64'
path: Package/Assembled-Windows0.64
- name: Download Assembled-Windows 0.65 Folder
uses: actions/download-artifact@v2
with:
name: 'Assembled-Windows0.65'
path: Package/Assembled-Windows0.65
- name: Display structure of downloaded Assembled and Assembled-Windows folders
run: ls -R
- name: Setup Node.js
Expand All @@ -123,10 +76,33 @@ jobs:
working-directory: ./Package/Assembled
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Version & Publish Package @babylonjs/react-native-windows

- name: Version & Publish Package @babylonjs/react-native-iosandroid-0-64
run: |
npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//}
npm publish --access public
working-directory: ./Package/Assembled-iOSAndroid0.64
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Version & Publish Package @babylonjs/react-native-iosandroid-0-65
run: |
npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//}
npm publish --access public
working-directory: ./Package/Assembled-iOSAndroid0.65
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Version & Publish Package @babylonjs/react-native-windows-0-64
run: |
npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//}
npm publish --access public
working-directory: ./Package/Assembled-Windows
working-directory: ./Package/Assembled-Windows0.64
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Version & Publish Package @babylonjs/react-native-windows-0-65
run: |
npm version --no-git-tag-version ${GITHUB_REF/refs\/tags\//}
npm publish --access public
working-directory: ./Package/Assembled-Windows0.64
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
120 changes: 0 additions & 120 deletions .github/workflows/publish_no_release.yml

This file was deleted.

9 changes: 2 additions & 7 deletions .github/workflows/typescript.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
name: 'build Typescript'

on:
workflow_call:
inputs:
Release_Version:
required: true
type: string
on: [workflow_call]

jobs:
Build:
Expand All @@ -25,7 +20,7 @@ jobs:
run: npm install
working-directory: ./Package
- name: Gulp
run: npx gulp buildTS --releaseVersion ${{ inputs.Release_Version }}
run: npx gulp buildTS --releaseVersion ${{ github.event.release.name }}
working-directory: ./Package
- name: Upload Assembled Folder
uses: actions/upload-artifact@v2
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ on:
react-native-version:
required: true
type: string
Release_Version:
required: true
type: string

jobs:
Build:
Expand All @@ -34,7 +31,7 @@ jobs:
run: npm install
working-directory: ./Package
- name: Git (Windows)
run: npx gulp initializeSubmodulesWindowsAgent --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.Release_Version }}
run: npx gulp initializeSubmodulesWindowsAgent --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ github.event.release.name }}
working-directory: ./Package
- name: Gulp (Windows)
run: npx gulp buildUWPPublish
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "Core/react-native-babylon/submodules/BabylonNative"]
path = Modules/@babylonjs/react-native/submodules/BabylonNative
[submodule "Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative"]
path = Modules/@babylonjs/react-native-iosandroid/submodules/BabylonNative
url = https://github.com/BabylonJS/BabylonNative.git

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

1 change: 1 addition & 0 deletions Apps/Playground/0.64/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"@babylonjs/core": "5.0.0-rc.4",
"@babylonjs/loaders": "5.0.0-rc.4",
"@babylonjs/react-native": "file:../../../Modules/@babylonjs/react-native",
"@babylonjs/react-native-iosandroid": "file:../../../Modules/@babylonjs/react-native-iosandroid",
"@babylonjs/react-native-windows": "file:../../../Modules/@babylonjs/react-native-windows",
"@babylonjs/playground-shared": "file:../playground-shared",
"@react-native-community/slider": "4.0.0-rc.3",
Expand Down
2 changes: 1 addition & 1 deletion Apps/Playground/0.64/scripts/tools.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const chalk = require('chalk');

function iosCmake() {
console.log(chalk.black.bgCyan('Running CMake for iOS...'));
shelljs.exec('cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_PCH=OFF .', {cwd: 'node_modules/@babylonjs/react-native/ios'});
shelljs.exec('cmake -G Xcode -DCMAKE_TOOLCHAIN_FILE=../submodules/BabylonNative/Dependencies/ios-cmake/ios.toolchain.cmake -DPLATFORM=OS64COMBINED -DENABLE_ARC=0 -DENABLE_BITCODE=1 -DDEPLOYMENT_TARGET=12 -DENABLE_PCH=OFF .', {cwd: 'node_modules/@babylonjs/react-native-iosandroid/ios'});
}

function postInstall() {
Expand Down
Loading