Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"packageRules": [
{
"groupName": "@react-native-community/cli",
"allowedVersions": "^18.0.0",
"allowedVersions": "^20.0.0",
"matchPackageNames": ["@react-native-community/cli**"]
},
{
Expand Down Expand Up @@ -41,7 +41,7 @@
{
"groupName": "react",
"matchPackageNames": ["@types/react", "react"],
"allowedVersions": "~19.0.0"
"allowedVersions": "~19.1.0"
},
{
"groupName": "react-native",
Expand All @@ -55,7 +55,7 @@
"react-native-macos",
"react-native-windows"
],
"allowedVersions": "^0.79.0"
"allowedVersions": "^0.81.0"
}
],
"postUpdateOptions": ["yarnDedupeHighest"],
Expand Down
40 changes: 36 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -450,7 +450,7 @@ jobs:
name: "visionOS"
permissions: {}
runs-on: macos-15
if: ${{ github.event_name != 'schedule' }}
if: false # visionOS temporarily disabled until releases are resumed
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps it should switch to use the rnm version if we want it..

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If anyone cares enough for visionOS, I guess we can. But separately from this PR.

steps:
- name: Checkout
uses: actions/checkout@v5
Expand Down Expand Up @@ -504,7 +504,7 @@ jobs:
matrix:
template: [all, visionos]
runs-on: macos-15
if: ${{ github.event_name != 'schedule' }}
if: false # visionOS temporarily disabled until releases are resumed
steps:
- name: Checkout
uses: actions/checkout@v5
Expand Down Expand Up @@ -559,6 +559,7 @@ jobs:
uses: ./.github/actions/setup-toolchain
with:
platform: windows
node-version: 22
- name: Set up react-native@canary
if: ${{ github.event_name == 'schedule' }}
uses: ./.github/actions/setup-react-native
Expand All @@ -573,7 +574,7 @@ jobs:
yarn build:windows
- name: Generate Visual Studio solution
run: |
node ../windows/app.mjs --use-nuget --msbuildprops WindowsTargetPlatformVersion=10.0.26100.0
node ../windows/app.mjs --msbuildprops WindowsTargetPlatformVersion=10.0.26100.0
working-directory: packages/app/example
- name: Test `react-native config`
run: |
Expand All @@ -582,7 +583,14 @@ jobs:
- name: Determine whether the Windows app needs to be built
id: affected
uses: ./.github/actions/affected
- name: Install Windows App SDK
if: ${{ steps.affected.outputs.windows != '' }}
run: |
../node_modules/react-native-windows/Scripts/rnw-dependencies.ps1 -Install -NoPrompt -Enterprise
nuget restore Example.sln
working-directory: packages/app/example/windows
- name: Build
id: build
if: ${{ steps.affected.outputs.windows != '' }}
run: |
if ("${{ matrix.configuration }}" -eq "Release") {
Expand All @@ -591,6 +599,16 @@ jobs:
yarn ci:windows --arch ${{ matrix.platform }}
}
working-directory: packages/app/example
continue-on-error: true
- name: Build (2nd attempt)
if: ${{ steps.affected.outputs.windows != '' && steps.build.outcome != 'success' }}
run: |
if ("${{ matrix.configuration }}" -eq "Release") {
yarn ci:windows --release --arch ${{ matrix.platform }}
} else {
yarn ci:windows --arch ${{ matrix.platform }}
}
working-directory: packages/app/example
- name: Upload build logs
if: ${{ steps.affected.outputs.windows != '' && failure() }}
uses: actions/upload-artifact@v6
Expand Down Expand Up @@ -624,6 +642,7 @@ jobs:
uses: ./.github/actions/setup-toolchain
with:
platform: windows
node-version: 22
- name: Initialize test app
uses: ./.github/actions/init-test-app
with:
Expand All @@ -634,16 +653,29 @@ jobs:
working-directory: template-example
- name: Generate Visual Studio solution
run: |
yarn install-windows-test-app --use-nuget --msbuildprops WindowsTargetPlatformVersion=10.0.26100.0
yarn install-windows-test-app --msbuildprops WindowsTargetPlatformVersion=10.0.26100.0
working-directory: template-example
- name: Determine whether the Windows app needs to be built
id: affected
uses: ./.github/actions/affected
- name: Install Windows App SDK
if: ${{ steps.affected.outputs.windows != '' }}
run: |
../node_modules/react-native-windows/Scripts/rnw-dependencies.ps1 -Install -NoPrompt -Enterprise
nuget restore TemplateExample.sln
working-directory: template-example/windows
- name: Build
id: build
if: ${{ steps.affected.outputs.windows != '' }}
run: |
yarn windows --logging --no-packager --no-launch --no-deploy
working-directory: template-example
continue-on-error: true
- name: Build (2nd attempt)
if: ${{ steps.affected.outputs.windows != '' && steps.build.outcome != 'success' }}
run: |
yarn windows --logging --no-packager --no-launch --no-deploy
working-directory: packages/app/example
- name: Upload build logs
if: ${{ steps.affected.outputs.windows != '' && failure() }}
uses: actions/upload-artifact@v6
Expand Down
5 changes: 0 additions & 5 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ nodeLinker: pnpm
npmMinimalAgeGate: 7d
npmRegistryServer: "https://registry.npmjs.org"
packageExtensions:
"@callstack/react-native-visionos@0.79":
dependencies:
"@react-native-community/cli": ^18.0.0
"@react-native-community/cli-platform-apple": ^18.0.0
"@react-native-community/cli-platform-ios": ^18.0.0
appium@3:
dependencies:
"@colors/colors": ^1.6.0
Expand Down
29 changes: 15 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,20 @@
"@microsoft/eslint-plugin-sdl/eslint-plugin-n": "^17.10.3",
"@microsoft/eslint-plugin-sdl/eslint-plugin-react": "^7.37.3",
"@pnpm/network.ca-file/graceful-fs": "~4.2.10",
"@react-native-community/cli": "^18.0.0",
"@react-native-community/cli-platform-android": "^18.0.0",
"@react-native-community/cli-platform-apple": "^18.0.0",
"@react-native-community/cli-platform-ios": "^18.0.0",
"@react-native-mac/virtualized-lists": "^0.79.0",
"@react-native/assets-registry": "^0.79.0",
"@react-native/codegen": "^0.79.0",
"@react-native/community-cli-plugin": "^0.79.0",
"@react-native/community-cli-plugin/@react-native-community/cli-server-api": "^18.0.0",
"@react-native/community-cli-plugin/@react-native-community/cli-tools": "^18.0.0",
"@react-native/gradle-plugin": "^0.79.0",
"@react-native/js-polyfills": "^0.79.0",
"@react-native/normalize-colors": "^0.79.0",
"@react-native/virtualized-lists": "^0.79.0",
"@react-native-community/cli": "^20.0.0",
"@react-native-community/cli-platform-android": "^20.0.0",
"@react-native-community/cli-platform-apple": "^20.0.0",
"@react-native-community/cli-platform-ios": "^20.0.0",
"@react-native-mac/virtualized-lists": "^0.81.0",
"@react-native/assets-registry": "^0.81.0",
"@react-native/codegen": "^0.81.0",
"@react-native/community-cli-plugin": "^0.81.0",
"@react-native/community-cli-plugin/@react-native-community/cli-server-api": "^20.0.0",
"@react-native/community-cli-plugin/@react-native-community/cli-tools": "^20.0.0",
"@react-native/gradle-plugin": "^0.81.0",
"@react-native/js-polyfills": "^0.81.0",
"@react-native/normalize-colors": "^0.81.0",
"@react-native/virtualized-lists": "^0.81.0",
"appium/ajv": "~8.17.1",
"appium/axios": "^1.11.0",
"appium/lru-cache": "^11.2.1",
Expand All @@ -81,6 +81,7 @@
"bplist-parser": "~0.3.2",
"compression/bytes": "^3.0.0",
"express/qs": "^6.13.0",
"react-native-windows/metro-source-map": "^0.83.1",
"safe-buffer": "~5.2.1"
},
"workspaces": [
Expand Down
Loading
Loading