Skip to content
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

Fix build after VMs update #657

Merged
merged 13 commits into from
Sep 11, 2024
4 changes: 4 additions & 0 deletions .github/workflows/bn_master_commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup Node 16
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -55,6 +57,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup Node 16
uses: actions/setup-node@v3
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/ios_android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:
type: string
xcode-version:
type: string
default: '15.0.1'
default: '15.4'

jobs:
Build:
Expand All @@ -21,6 +21,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup Node 16
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -54,12 +56,12 @@ jobs:
env:
JAVA_HOME: ${{ env.JAVA_HOME_11_X64 }}
- name: Upload Assembled iOS Android Folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'Assembled-iOSAndroid${{ inputs.react-native-version }}'
path: Package/Assembled-iOSAndroid
- name: Upload Assembled iOS Android BaseKit Folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'Assembled-BaseKit-iOSAndroid${{ inputs.react-native-version }}'
path: Package/Assembled-BaseKit-iOSAndroid
15 changes: 15 additions & 0 deletions .github/workflows/macos_freespace/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Free up disk space
description: Free up disk space see https://github.com/actions/runner-images/issues/10511
runs:
using: "composite"
steps:
- name: Free up disk space
shell: bash
run: |
xcrun simctl delete all
sudo rm -rf ~/Library/Developer/CoreSimulator/Caches/*
sudo rm -rf /Applications/Xcode_14.3.1.app
sudo rm -rf /Applications/Xcode_15.0.1.app
sudo rm -rf /Applications/Xcode_15.1.app
sudo rm -rf /Applications/Xcode_15.2.app
sudo rm -rf /Applications/Xcode_15.3.app
12 changes: 11 additions & 1 deletion .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup Node 16
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -52,6 +54,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup CMake
uses: jwlawson/actions-setup-cmake@v1.8
with:
Expand Down Expand Up @@ -90,6 +94,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup Node 16
uses: actions/setup-node@v3
with:
Expand All @@ -114,6 +120,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup Watchman
run: brew install watchman

Expand All @@ -139,6 +147,8 @@ jobs:
uses: actions/checkout@v2.3.3
with:
submodules: 'recursive'
- name: Free space
uses: ./.github/workflows/macos_freespace
- name: Setup Node 16
uses: actions/setup-node@v3
with:
Expand Down Expand Up @@ -323,4 +333,4 @@ jobs:
build-typescript:
uses: ./.github/workflows/typescript.yml
with:
release-version: 0.0.${GITHUB_SHA::8}
release-version: 0.0.${GITHUB_SHA::8}
12 changes: 6 additions & 6 deletions .github/workflows/test_version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
msbuild.exe /p:Configuration="Release" /p:Platform="x64" /m "./windows/Playground.sln"

- name: Upload UWP x64
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'WindowsAppx'
path: Playground/windows/AppPackages/Playground/Playground_1.0.0.0_x64_Test/ #Playground_1.0.0.0_x64.appx
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
./gradlew app:assembleRelease --stacktrace --info

- name: Upload APK
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'AndroidAPK'
path: Playground/android/app/build/outputs/apk/release/app-release.apk
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive

- name: Upload iOS App
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'iOSApp'
path: Playground/ios/playgroundSimulator.xcarchive
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
./gradlew app:assembleRelease --stacktrace --info

- name: Upload APK
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'AndroidBasekitAPK'
path: Playground/android/app/build/outputs/apk/release/app-release.apk
Expand Down Expand Up @@ -197,7 +197,7 @@ jobs:
xcodebuild -sdk iphonesimulator -arch x86_64 -configuration Release -workspace Playground.xcworkspace -scheme Playground build CODE_SIGNING_ALLOWED=NO -archivePath ./playgroundSimulator.xcarchive archive

- name: Upload iOS App
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'iOSBasekitApp'
path: Playground/ios/playgroundSimulator.xcarchive
Expand All @@ -207,7 +207,7 @@ jobs:
# runs-on: macos-latest
# steps:
# - name: Download APK
# uses: actions/download-artifact@v2
# uses: actions/download-artifact@v4
# with:
# name: 'AndroidAPK'
# path: ./
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
run: npx gulp buildTS --releaseVersion ${{ inputs.release-version }}
working-directory: ./Package
- name: Upload Assembled Folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'Assembled'
path: Package/Assembled
4 changes: 2 additions & 2 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ jobs:
run: npx gulp buildUWPPublish --reactNative ${{ inputs.react-native-version }} --releaseVersion ${{ inputs.release-version }}
working-directory: ./Package
- name: Upload Assembled-Windows Folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'Assembled-Windows${{ inputs.react-native-version }}'
path: Package/Assembled-Windows
- name: Upload Assembled-BaseKit-Windows Folder
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: 'Assembled-BaseKit-Windows${{ inputs.react-native-version }}'
path: Package/Assembled-BaseKit-Windows
6 changes: 3 additions & 3 deletions Apps/BRNPlayground/metro.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ module.exports = makeMetroConfig({
}),
},
watchFolders: [
path.join(__dirname, "node_modules", "@babylonjs/react-native"),
path.join(__dirname, "node_modules", "@babylonjs/react-native-iosandroid"),
path.join(__dirname, "node_modules", "@babylonjs/react-native-windows"),
path.dirname(require.resolve("@babylonjs/react-native/package.json")),
path.dirname(require.resolve("@babylonjs/react-native-iosandroid/package.json")),
path.dirname(require.resolve("@babylonjs/react-native-windows/package.json")),
],
});
46 changes: 23 additions & 23 deletions Apps/BRNPlayground/package-lock.json

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

2 changes: 1 addition & 1 deletion Apps/BRNPlayground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"jest": "^29.6.3",
"mkdirp": "^1.0.0",
"prettier": "2.8.8",
"react-native-test-app": "^3.4.2",
"react-native-test-app": "^3.10.3",
"react-test-renderer": "18.2.0",
"typescript": "5.0.4"
},
Expand Down
Loading