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.

Sign up for GitHub

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

Jump to bottom

refact: merge example and test example apps #2225

Merged
merged 20 commits into from
Jul 9, 2024
Merged

refact: merge example and test example apps #2225

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
5162921
put example and test-example into one dir
alduzy Jul 2, 2024
03ea733
added default export
alduzy Jul 2, 2024
a321c79
removed test apps
alduzy Jul 2, 2024
65fe42e
added apps index file
alduzy Jul 2, 2024
a0f3be1
added apps index file
alduzy Jul 2, 2024
66561b3
updated workflows and guide
alduzy Jul 2, 2024
aa85b75
adjusted guide for new structure
alduzy Jul 2, 2024
6e987c7
workflow adjutment: build example instead of testsexample
alduzy Jul 2, 2024
a53fa06
typo fix
alduzy Jul 2, 2024
0f09ada
fabric tests worklfow adjusted
alduzy Jul 2, 2024
43705ae
Merge remote-tracking branch 'origin/main' into @alduzy/merge-example…
alduzy Jul 2, 2024
e5a5127
TestApp imports improvement
alduzy Jul 2, 2024
1afa70a
updated switching between example and tests
alduzy Jul 2, 2024
fd1249c
Merge remote-tracking branch 'origin/main' into @alduzy/merge-example…
alduzy Jul 2, 2024
a415eca
updated contributing
alduzy Jul 2, 2024
4db2cd2
Merge remote-tracking branch 'origin/main' into @alduzy/merge-example…
alduzy Jul 8, 2024
78ab7f9
Added comment
alduzy Jul 8, 2024
31a8a81
Merge remote-tracking branch 'origin/main' into @alduzy/merge-example…
alduzy Jul 9, 2024
6f513de
Merge remote-tracking branch 'origin/main' into @alduzy/merge-example…
alduzy Jul 9, 2024
de7caec
Update guides/CONTRIBUTING.md
alduzy Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions .github/workflows/android-build-test-fabric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- 'android/**'
- 'common/**'
- 'src/fabric/**'
- 'FabricTestExample/**'
- 'FabricExample/**'
- 'package.json'
- '.github/workflows/android-build-test-fabric.yml'
push:
Expand All @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
WORKING_DIRECTORY: FabricTestExample
WORKING_DIRECTORY: FabricExample
concurrency:
group: android-fabric-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -37,7 +37,7 @@ jobs:
with:
node-version: 18
cache: 'yarn'
cache-dependency-path: 'FabricTestExample/yarn.lock'
cache-dependency-path: 'FabricExample/yarn.lock'
- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/android-build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
paths:
- 'android/**'
- 'package.json'
- 'TestsExample/**'
- 'Example/**'
- '.github/workflows/android-build-test.yml'
push:
branches:
Expand All @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
WORKING_DIRECTORY: TestsExample
WORKING_DIRECTORY: Example
concurrency:
group: android-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -35,7 +35,7 @@ jobs:
with:
node-version: 18
cache: 'yarn'
cache-dependency-path: 'TestsExample/yarn.lock'
cache-dependency-path: 'Example/yarn.lock'
- name: Install node dependencies
working-directory: ${{ env.WORKING_DIRECTORY }}
run: yarn
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ios-build-test-fabric.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- 'ios/**'
- 'common/**'
- 'src/fabric/**'
- 'FabricTestExample/**'
- 'FabricExample/**'
push:
branches:
- main
Expand All @@ -20,7 +20,7 @@ jobs:
runs-on: macos-14
timeout-minutes: 60
env:
WORKING_DIRECTORY: FabricTestExample
WORKING_DIRECTORY: FabricExample
concurrency:
group: ios-fabric-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -33,7 +33,7 @@ jobs:
with:
node-version: 18
cache: 'yarn'
cache-dependency-path: 'FabricTestExample/yarn.lock'
cache-dependency-path: 'FabricExample/yarn.lock'
- name: Use latest stable Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ios-build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:
- 'package.json'
- 'ios/**'
- 'common/**'
- 'TestsExample/**'
- 'Example/**'
push:
branches:
- main
Expand All @@ -19,7 +19,7 @@ jobs:
runs-on: macos-14
timeout-minutes: 60
env:
WORKING_DIRECTORY: TestsExample
WORKING_DIRECTORY: Example
concurrency:
group: ios-${{ github.ref }}
cancel-in-progress: true
Expand All @@ -31,7 +31,7 @@ jobs:
with:
node-version: 18
cache: 'yarn'
cache-dependency-path: 'TestsExample/yarn.lock'
cache-dependency-path: 'Example/yarn.lock'
- name: Use latest stable Xcode
uses: maxim-lobanov/setup-xcode@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion Example/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import App from '../apps/examples';
import App from '../apps';

export default App;
1 change: 0 additions & 1 deletion Example/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/** @format */
import 'react-native-gesture-handler';
import { AppRegistry } from 'react-native';
import App from './App';
Expand Down
2 changes: 1 addition & 1 deletion FabricExample/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import App from '../apps/examples';
import App from '../apps';

export default App;
4 changes: 0 additions & 4 deletions FabricExample/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
/**
* @format
*/

import {AppRegistry} from 'react-native';
import App from './App';
import {name as appName} from './app.json';
Expand Down
2 changes: 0 additions & 2 deletions FabricTestExample/.bundle/config
View file
Open in desktop

This file was deleted.

74 changes: 0 additions & 74 deletions FabricTestExample/.gitignore
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion FabricTestExample/.watchmanconfig
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions FabricTestExample/App.js
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions FabricTestExample/Gemfile
View file
Open in desktop

This file was deleted.

105 changes: 0 additions & 105 deletions FabricTestExample/Gemfile.lock
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions FabricTestExample/__tests__/App-test.js
View file
Open in desktop

This file was deleted.

Loading
Loading