Skip to content

Commit

Permalink
clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@CedricGuillemet
CedricGuillemet committed May 23, 2024
1 parent 233d17c commit 22aeec0
Show file tree
Hide file tree
Showing 2 changed files with 155 additions and 89 deletions.
233 changes: 155 additions & 78 deletions .github/workflows/pr.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,44 @@ env:

jobs:
build-android:
runs-on: macos-latest
steps:
- name: Checkout Repo
uses: actions/[email protected]
with:
submodules: 'recursive'
- name: Setup Node 16
uses: actions/setup-node@v3
with:
node-version: 16
- name: Setup CMake
uses: jwlawson/[email protected]
with:
cmake-version: '3.26.3'
- name: Setup Ninja
run: brew install ninja
- name: NPM Install (Playground)
run: npm install
working-directory: ./Apps/Playground
- name: NPM Install (React Native ${{ env.BRN_Version }})
run: npm run select ${{ env.BRN_Version }}
working-directory: ./Apps/Playground
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
check-latest: true
- name: Gulp (Android)
run: npx gulp buildAndroid
working-directory: ./Package
env:
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}

build-android-rnta:
runs-on: macos-latest
steps:
- name: Checkout Repo
Expand Down Expand Up @@ -44,13 +82,32 @@ jobs:
working-directory: ./Package
env:
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
- name: Upload android
uses: actions/upload-artifact@v2
with:
name: 'Android-artifact'
path: Build

build-iOS:
runs-on: macos-latest
steps:
- name: Checkout Repo
uses: actions/[email protected]
with:
submodules: 'recursive'
- name: Setup Node 16
uses: actions/setup-node@v3
with:
node-version: 16
- name: NPM Install (Playground)
run: npm install
working-directory: ./Apps/Playground
- name: NPM Install (React Native ${{ env.BRN_Version }})
run: npm run select --reactNative ${{ env.BRN_Version }}
working-directory: ./Apps/Playground
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Gulp (iOS)
run: npx gulp buildIOS
working-directory: ./Package

build-iOS-rnta:
runs-on: macos-latest
steps:
- name: Checkout Repo
Expand All @@ -74,13 +131,46 @@ jobs:
- name: Gulp (iOS)
run: npx gulp buildIOSRNTA
working-directory: ./Package
# - name: Upload ios
# uses: actions/upload-artifact@v2
# with:
# name: 'ios-artifact'
# path: Apps/BRNPlayground/

build-windows:
test-publish-android-ios:
runs-on: macos-latest
steps:
- name: Checkout Repo
uses: actions/[email protected]
with:
submodules: 'recursive'
- name: Setup Node 16
uses: actions/setup-node@v3
with:
node-version: 16
- name: Setup CMake
uses: jwlawson/[email protected]
with:
cmake-version: '3.26.3'
- name: Setup Ninja
run: brew install ninja
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17'
check-latest: true
- name: NPM Install (Playground)
run: npm install
working-directory: ./Apps/Playground
- name: NPM Install (React Native ${{ env.BRN_Version }})
run: npm run select --reactNative ${{ env.BRN_Version }}
working-directory: ./Apps/Playground
- name: NPM Install (Binary Package)
run: npm install
working-directory: ./Package
- name: Gulp
run: npx gulp
working-directory: ./Package
env:
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}

build-windows-rnta:
runs-on: windows-2019
steps:
- name: Support longpaths
Expand All @@ -99,10 +189,7 @@ jobs:
- name: Install watchman
run: choco install watchman
working-directory: ./Apps/BRNPlayground
# - name: Setup NuGet
# uses: nuget/setup-nuget@v1
# with:
# nuget-version: '5.x'

- name: NPM Install RNTA
run: npm install
working-directory: ./Apps/BRNPlayground
Expand All @@ -119,13 +206,9 @@ jobs:
run: npx install-windows-test-app
working-directory: ./Apps/BRNPlayground

# - name: Gulp build windows
# run: npx gulp buildUWPx64DebugRNTA
# working-directory: ./Package

- name: BabylonNative build directory
run: mkdir @babylonjs/react-native/Build/uwp_x64
working-directory: ./Modules
working-directory: ./Modules

- name: CMake BabylonNative
run: cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0.19041.0 -DCMAKE_UNITY_BUILD=true -D CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION_MAXIMUM=10.0.19041.0 -A x64 ./../../../react-native-windows/windows
Expand All @@ -143,62 +226,56 @@ jobs:
run: MSBuild /p:Platform="x64" /p:Configuration="Release" /m BRNPlayground.sln
working-directory: ./Apps/BRNPlayground/windows

- name: Upload Windows
uses: actions/upload-artifact@v2
with:
name: 'Windows-artifact'
path: Apps/BRNPlayground/windows/AppPackages/ReactTestApp/ReactTestApp_1.0.0.0_x64_Test

# Test packages
# build-android-ios-065:
# uses: ./.github/workflows/ios_android.yml
# with:
# react-native-version: '0.65'
# release-version: 0.0.${GITHUB_SHA::8}
#
# build-android-ios-069:
# uses: ./.github/workflows/ios_android.yml
# with:
# react-native-version: '0.69'
# release-version: 0.0.${GITHUB_SHA::8}
#
# build-android-ios-070:
# uses: ./.github/workflows/ios_android.yml
# with:
# react-native-version: '0.70'
# release-version: 0.0.${GITHUB_SHA::8}
#
# build-android-ios-071:
# uses: ./.github/workflows/ios_android.yml
# with:
# react-native-version: '0.71'
# release-version: 0.0.${GITHUB_SHA::8}
#
# build-windows-065:
# uses: ./.github/workflows/windows.yml
# with:
# react-native-version: '0.65'
# release-version: 0.0.${GITHUB_SHA::8}
#
# build-windows-069:
# uses: ./.github/workflows/windows.yml
# with:
# react-native-version: '0.69'
# release-version: 0.0.${GITHUB_SHA::8}
#
# build-windows-070:
# uses: ./.github/workflows/windows.yml
# with:
# react-native-version: '0.70'
# release-version: 0.0.${GITHUB_SHA::8}
#
# build-windows-071:
# uses: ./.github/workflows/windows.yml
# with:
# react-native-version: '0.71'
# release-version: 0.0.${GITHUB_SHA::8}

# build-typescript:
# uses: ./.github/workflows/typescript.yml
# with:
# release-version: 0.0.${GITHUB_SHA::8}
build-android-ios-065:
uses: ./.github/workflows/ios_android.yml
with:
react-native-version: '0.65'
release-version: 0.0.${GITHUB_SHA::8}

build-android-ios-069:
uses: ./.github/workflows/ios_android.yml
with:
react-native-version: '0.69'
release-version: 0.0.${GITHUB_SHA::8}

build-android-ios-070:
uses: ./.github/workflows/ios_android.yml
with:
react-native-version: '0.70'
release-version: 0.0.${GITHUB_SHA::8}

build-android-ios-071:
uses: ./.github/workflows/ios_android.yml
with:
react-native-version: '0.71'
release-version: 0.0.${GITHUB_SHA::8}

build-windows-065:
uses: ./.github/workflows/windows.yml
with:
react-native-version: '0.65'
release-version: 0.0.${GITHUB_SHA::8}

build-windows-069:
uses: ./.github/workflows/windows.yml
with:
react-native-version: '0.69'
release-version: 0.0.${GITHUB_SHA::8}

build-windows-070:
uses: ./.github/workflows/windows.yml
with:
react-native-version: '0.70'
release-version: 0.0.${GITHUB_SHA::8}

build-windows-071:
uses: ./.github/workflows/windows.yml
with:
react-native-version: '0.71'
release-version: 0.0.${GITHUB_SHA::8}

build-typescript:
uses: ./.github/workflows/typescript.yml
with:
release-version: 0.0.${GITHUB_SHA::8}
11 changes: 0 additions & 11 deletions Package/gulpfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,14 +143,6 @@ const buildUWPARM64Release = async () => {
exec('.\\..\\Modules\\@babylonjs\\react-native-windows\\windows\\scripts\\Build.bat -Platform ARM64 -Configuration Release');
}

const buildUWPx64DebugRNTA = async () => {
shelljs.mkdir('-p', `./../Modules/@babylonjs/react-native/Build/uwp_x64`);
exec(`cmake -G "Visual Studio 16 2019" -D CMAKE_SYSTEM_NAME=WindowsStore -D CMAKE_SYSTEM_VERSION=10.0 -DCMAKE_UNITY_BUILD=true ${cmakeBasekitBuildDefinition} -A 'x64' ./../../../react-native-windows/windows`, `./../Modules/@babylonjs/react-native/Build/uwp_x64`);
exec('nuget restore Playground.sln', './../Apps/BRNPlayground/windows');
exec('MSBuild /t:Restore /m ../Apps/BRNPlayground/windows/BRNPlayground.sln');
exec('MSBuild /p:Platform="x64" /p:Configuration="Release" /m ../Apps/BRNPlayground/windows/BRNPlayground.sln');
}

const buildUWPProject = gulp.parallel(
buildUWPx86Debug,
buildUWPx86Release,
Expand Down Expand Up @@ -689,6 +681,3 @@ exports.packUWP = packUWP;
exports.packUWPNoBuild = packUWPNoBuild;

exports.default = build;

exports.buildUWPx64DebugRNTA = buildUWPx64DebugRNTA;

0 comments on commit 22aeec0

Please sign in to comment.