Skip to content

Commit c7eff86

Browse files
authored
Merge pull request #6719 from StoDevX/drew/rn-71
Upgrade react native to v0.71.0
2 parents 17629b6 + 8598998 commit c7eff86

File tree

73 files changed

+11165
-26822
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+11165
-26822
lines changed

.github/workflows/check.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -354,27 +354,20 @@ jobs:
354354
uses: actions/cache/restore@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
355355
id: jsbundle-cache
356356
with:
357-
path: |
358-
./android/app/src/main/assets/index.android.bundle
359-
./android/app/src/main/assets/index.android.bundle.map
360-
./android/app/src/main/res/
357+
path: ./android/generated/
361358
key: ${{ runner.os }}-npm-node@${{ env.node_version }}-pkg@${{ hashFiles('package.json', 'package-lock.json', '.github/job.yml') }}-files@${{ hashFiles('tsconfig.json', 'babel.config.js', 'index.js', 'data/**', 'images/**', 'modules/**.ts', 'modules/**.tsx', 'source/**.ts', 'source/**.tsx') }}
362359

363360
- name: Generate jsbundle
364361
if: steps.jsbundle-cache.outputs.cache-hit != 'true'
365362
run: |
366-
mkdir -p ./android/app/src/main/assets/
367363
npm run bundle-data
368364
APP_MODE=mocked npm run bundle:android
369365
370366
- name: Cache the jsbundle
371367
if: steps.jsbundle-cache.outputs.cache-hit != 'true'
372368
uses: actions/cache/save@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
373369
with:
374-
path: |
375-
./android/app/src/main/assets/index.android.bundle
376-
./android/app/src/main/assets/index.android.bundle.map
377-
./android/app/src/main/res/
370+
path: ./android/generated/
378371
key: ${{ steps.jsbundle-cache.outputs.cache-primary-key }}
379372

380373
android:
@@ -409,6 +402,9 @@ jobs:
409402
echo 524288 | sudo tee -a /proc/sys/fs/inotify/max_queued_events
410403
echo 524288 | sudo tee -a /proc/sys/fs/inotify/max_user_instances
411404
sudo sysctl -p
405+
406+
# temporary, until we can get SKIP_BUNDLING to work
407+
- run: npm run bundle-data
412408

413409
- name: Gradle
414410
uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # v2
@@ -426,6 +422,17 @@ jobs:
426422
with:
427423
name: build-reports
428424
path: build/reports/
425+
426+
- name: Cache the Android app
427+
uses: actions/cache/save@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 # v3
428+
with:
429+
path: android/app/build/outputs/apk/
430+
key: ${{ steps.app-cache.outputs.cache-primary-key }}
431+
432+
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
433+
with:
434+
name: android-app
435+
path: android/app/build/outputs/apk/
429436

430437
ios-build:
431438
name: Build for iOS
@@ -503,6 +510,11 @@ jobs:
503510
with:
504511
path: ios/build/Build/Products/
505512
key: ${{ steps.app-cache.outputs.cache-primary-key }}
513+
514+
- uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3
515+
with:
516+
name: ios-app
517+
path: ios/build/Build/Products/
506518

507519
ios-detox:
508520
name: Detox E2E for iOS

.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ DerivedData
2222
*.hmap
2323
*.ipa
2424
*.xcuserstate
25+
/ios/.xcode.env.local
2526

2627
# Cocoapods
27-
ios/Pods
28+
/ios/Pods
2829

2930
# Android/IntelliJ
3031
build/
@@ -33,6 +34,9 @@ build/
3334
local.properties
3435
*.iml
3536
*.hprof
37+
.cxx/
38+
*.keystore
39+
!debug.keystore
3640

3741
# node.js
3842
node_modules/
@@ -59,7 +63,6 @@ fastlane/test_output
5963
android/app/signing.properties
6064
android/app/upload-keystore.properties
6165
fastlane/play-private-key.json
62-
*.keystore
6366

6467
# vim temp files
6568
*.swp

.node-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
16

0 commit comments

Comments
 (0)