Skip to content

Commit 141fca2

Browse files
committed
fix: ci scripts
1 parent 6e98be6 commit 141fca2

File tree

3 files changed

+28
-18
lines changed

3 files changed

+28
-18
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
uses: ./.github/actions/setup
3838

3939
- name: Run unit tests
40-
run: yarn test --maxWorkers=2 --coverage
40+
run: yarn test -- --maxWorkers=2 -- --passWithNoTests
4141

4242
build-library:
4343
runs-on: ubuntu-latest
@@ -97,7 +97,7 @@ jobs:
9797
path: |
9898
~/.gradle/wrapper
9999
~/.gradle/caches
100-
key: ${{ runner.os }}-gradle-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}
100+
key: ${{ runner.os }}-gradle-${{ hashFiles('apps/example/android/gradle/wrapper/gradle-wrapper.properties') }}
101101
restore-keys: |
102102
${{ runner.os }}-gradle-
103103
@@ -153,7 +153,7 @@ jobs:
153153
path: |
154154
~/.gradle/wrapper
155155
~/.gradle/caches
156-
key: ${{ runner.os }}-gradle-newarch-${{ hashFiles('example/android/gradle/wrapper/gradle-wrapper.properties') }}
156+
key: ${{ runner.os }}-gradle-newarch-${{ hashFiles('apps/example/android/gradle/wrapper/gradle-wrapper.properties') }}
157157
restore-keys: |
158158
${{ runner.os }}-gradle-newarch-
159159
@@ -193,7 +193,7 @@ jobs:
193193
- name: Install cocoapods
194194
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
195195
run: |
196-
cd example
196+
cd apps/example
197197
pod install --project-directory=ios
198198
env:
199199
NO_FLIPPER: 1
@@ -233,7 +233,7 @@ jobs:
233233
- name: Install cocoapods
234234
if: env.turbo_cache_hit != 1 && steps.cocoapods-cache.outputs.cache-hit != 'true'
235235
run: |
236-
cd example
236+
cd apps/example
237237
pod install --project-directory=ios
238238
env:
239239
RCT_NEW_ARCH_ENABLED: 1

package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
],
88
"scripts": {
99
"lint": "turbo run lint",
10+
"test": "turbo run test",
11+
"typecheck": "turbo run typecheck",
12+
"prepare": "turbo run prepare",
1013
"build:android": "turbo run build:android",
1114
"build:android:fabric": "turbo run build:android:fabric",
1215
"build:ios": "turbo run build:ios"

turbo.json

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
11
{
22
"$schema": "https://turbo.build/schema.json",
33
"tasks": {
4-
"lint": {},
4+
"lint": {
5+
"inputs": ["**/*.ts", "**/*.tsx", "**/*.js"]
6+
},
7+
"typecheck": {
8+
"inputs": ["**/*.ts", "**/*.tsx"]
9+
},
10+
"test": {},
11+
"prepare": {},
512
"build:android": {
6-
"env": ["ORG_GRADLE_PROJECT_newArchEnabled"],
13+
"env": ["JAVA_HOME", "ANDROID_NDK", "ANDROID_SDK", "ANDROID_HOME"],
714
"inputs": [
8-
"packages/*/package.json",
9-
"packages/*/android",
10-
"!android/build",
11-
"packages/*/src/*.ts",
12-
"packages/*/src/*.tsx",
15+
"packages/react-native-bottom-tabs/package.json",
16+
"packages/react-native-bottom-tabs/android",
17+
"packages/react-native-bottom-tabs/!android/build",
18+
"packages/react-native-bottom-tabs/src/*.ts",
19+
"packages/react-native-bottom-tabs/src/*.tsx",
1320
"apps/example/package.json",
1421
"apps/example/android",
1522
"!apps/example/android/.gradle",
@@ -19,13 +26,13 @@
1926
"outputs": []
2027
},
2128
"build:android:fabric": {
22-
"env": ["ORG_GRADLE_PROJECT_newArchEnabled"],
29+
"env": ["JAVA_HOME", "ANDROID_NDK", "ANDROID_SDK", "ANDROID_HOME"],
2330
"inputs": [
24-
"packages/*/package.json",
25-
"packages/*/android",
26-
"!android/build",
27-
"packages/*/src/*.ts",
28-
"packages/*/src/*.tsx",
31+
"packages/react-native-bottom-tabs/package.json",
32+
"packages/react-native-bottom-tabs/android",
33+
"packages/react-native-bottom-tabs/!android/build",
34+
"packages/react-native-bottom-tabs/src/*.ts",
35+
"packages/react-native-bottom-tabs/src/*.tsx",
2936
"apps/example/package.json",
3037
"apps/example/android",
3138
"!apps/example/android/.gradle",

0 commit comments

Comments
 (0)