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: 0 additions & 6 deletions .ccache/ccache.conf

This file was deleted.

2 changes: 2 additions & 0 deletions .changeset/silly-ideas-kneel.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
11 changes: 3 additions & 8 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -168,27 +168,22 @@ jobs:
if [[ "$(yarn show-affected --base origin/${{ github.base_ref }})" = *"@rnx-kit/test-app"* ]]; then
echo 'ios=true' >> $GITHUB_OUTPUT
fi
- name: Install Ccache
if: ${{ steps.affected-projects.outputs.ios != '' }}
run: |
brew install ccache
- name: Build @rnx-kit/cli
if: ${{ steps.affected-projects.outputs.ios != '' }}
run: |
yarn nx build @rnx-kit/cli
- name: Install Pods
uses: microsoft/react-native-test-app/.github/actions/cocoapods@trunk
if: ${{ steps.affected-projects.outputs.ios != '' }}
env:
RCT_USE_PREBUILT_RNCORE: 1
with:
project-directory: ios
working-directory: packages/test-app
- name: Build iOS app
if: ${{ steps.affected-projects.outputs.ios != '' }}
run: |
export CCACHE_DIR="$(git rev-parse --show-toplevel)/.ccache"
ccache --zero-stats 1> /dev/null
yarn build:ios --ccache-dir "$CCACHE_DIR" --ccache-home /opt/homebrew/opt/ccache | xcbeautify
ccache --show-stats --verbose
yarn build:ios | xcbeautify
working-directory: packages/test-app
build-website:
name: "Build the website"
Expand Down
1 change: 1 addition & 0 deletions packages/jest-preset/private/jest-preset.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ module.exports = {
...require("../jest-preset"),
collectCoverage: true,
collectCoverageFrom: ["src/**"],
coverageDirectory: "test/coverage",
roots: ["test"],
testRegex: "/test/.*\\.test\\.[jt]sx?$",
};
20 changes: 1 addition & 19 deletions packages/test-app-macos/ios/Podfile
Original file line number Diff line number Diff line change
@@ -1,19 +1 @@
ws_dir = Pathname.new(__dir__)
ws_dir = ws_dir.parent until
File.exist?("#{ws_dir}/node_modules/react-native-test-app/test_app.rb") ||
ws_dir.expand_path.to_s == '/'
require "#{ws_dir}/node_modules/react-native-test-app/test_app.rb"

workspace 'SampleCrossApp.xcworkspace'

options = {
:bridgeless_enabled => true,
:fabric_enabled => true,
:hermes_enabled => false,
}

use_test_app! options do |target|
target.app do
pod 'MSAL', :modular_headers => true
end
end
raise 'For iOS test app, please use the project in `packages/test-app/` instead'
2 changes: 1 addition & 1 deletion packages/test-app/ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ workspace 'SampleCrossApp.xcworkspace'
options = {
:bridgeless_enabled => true,
:fabric_enabled => true,
:hermes_enabled => false,
:hermes_enabled => true,
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Intentional with this change?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yeah, we haven't built jsc since 0.80 ripped it out of core.

}

use_test_app! options do |target|
Expand Down
Loading
Loading