-
Notifications
You must be signed in to change notification settings - Fork 63
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
CedricGuillemet
merged 69 commits into
BabylonJS:master
from
CedricGuillemet:NewPackageSystem
Mar 29, 2022
Merged
New package system #361
Changes from all commits
Commits
Show all changes
69 commits
Select commit
Hold shift + click to select a range
673fb99
rename folder/package
CedricGuillemetMS f309588
split between iosandroid and ts
CedricGuillemetMS dc7d2d2
gulp with new assembled folder
CedricGuillemetMS 60a3b44
force publish to use 0.64
CedricGuillemetMS c309d77
path fixing
CedricGuillemetMS eb626df
fix cmake ios
CedricGuillemetMS 6509917
ios path again
CedricGuillemetMS c2b37a0
react common path
CedricGuillemetMS 434d4a6
react-native-permissions
CedricGuillemetMS 5a44907
this should fix ios package build
CedricGuillemetMS 7bfb3a0
back to permissions 2.1.4
CedricGuillemetMS 0511660
lipo output path
CedricGuillemetMS 45078d7
checked assembled
CedricGuillemetMS af9280c
reusable workflows
CedricGuillemetMS 211234e
duplicate name
CedricGuillemetMS ffcf4a9
Updated windows project settings
SergioRZMasson e13b9eb
check assembled file list
CedricGuillemetMS 56a88de
Merge pull request #2 from SergioRZMasson/migration/version-windows
CedricGuillemet b25d91d
test without files check
CedricGuillemetMS 52b7e27
test version patch
CedricGuillemetMS ca36711
TS/native separation
CedricGuillemetMS 8348a4d
fixed bad job name
CedricGuillemetMS 3a35f64
workflow_call
CedricGuillemetMS c5d69a9
fix builts
CedricGuillemetMS 2f8489c
tsc
CedricGuillemetMS 7258600
tsc
CedricGuillemetMS 48d56ff
shared folder fix
CedricGuillemetMS 669c9fd
small fixes
CedricGuillemetMS 353ddf5
build ts
CedricGuillemetMS 9728144
local workflow, file list re-enabled
CedricGuillemetMS e152419
no version for local workflow
CedricGuillemetMS 3297957
validate assembled and iosAndroid
CedricGuillemetMS 098609f
expectedList
CedricGuillemetMS 35b7cb8
readme and file checks
CedricGuillemetMS 15e57b6
copyCommonFiles
CedricGuillemetMS 79573c5
Updated BabylonReactNative.vcxproj to search include headers into @b…
SergioRZMasson e1194b8
Fixed issue with windows build for package consumption vs repo build
SergioRZMasson d14b98d
Merge pull request #3 from SergioRZMasson/migration/version-windows
CedricGuillemet b7013ad
moved shared
CedricGuillemetMS 41a59a8
include path
CedricGuillemetMS 8e7be59
shared for windows
CedricGuillemetMS bdf39af
shared folder android
CedricGuillemetMS 5b20693
android cmake again
CedricGuillemetMS 8fcf3e0
Merge branch 'master' of https://github.com/BabylonJS/BabylonReactNat…
CedricGuillemetMS 3b07521
interop ios shared path
CedricGuillemetMS 34e4ae7
Update Package/gulpfile.js
CedricGuillemet 34b8fe6
PR feedback
CedricGuillemetMS 28e435f
Merge branch 'NewPackageSystem' of https://github.com/CedricGuillemet…
CedricGuillemetMS 8eb3626
check dir displays directory name
CedricGuillemetMS 282fe45
patch react-native package version
CedricGuillemetMS 2eb5a1f
release and version separated
CedricGuillemetMS 11c9521
typo
CedricGuillemetMS 514181f
default RN version for tsc
CedricGuillemetMS 08cc2b2
PR feedback
CedricGuillemetMS c3078d4
podspec
CedricGuillemetMS 993f5db
package name patching
CedricGuillemetMS 99cd46a
undo unnecessary changes
CedricGuillemetMS c6d6740
Fix conflicts
CedricGuillemet a358a85
removed workflow
CedricGuillemet aa4945b
more conflicts
CedricGuillemet 00ac7f8
submodule fix
CedricGuillemet 54985ce
submodule version
CedricGuillemet fe362fb
submodule path
CedricGuillemet 94cec35
Removed submodule Modules/@babylonjs/react-native/submodules/BabylonN…
CedricGuillemet 792846d
submodule fix 1
CedricGuillemet 45ea7cf
fix module 2
CedricGuillemet eaa1978
Removed submodule Modules/@babylonjs/react-native-iosandroid/submodules
CedricGuillemet 2b50cf4
fix submodule
CedricGuillemet 4962f71
cmake variable names
CedricGuillemetMS File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
@@ -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 | ||
|
@@ -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 }} |
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
2 changes: 1 addition & 1 deletion
2
Apps/Playground/0.64/ios/Playground.xcworkspace/contents.xcworkspacedata
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.