Skip to content

Commit c93ba23

Browse files
authored
Merge branch 'expo:main' into feat/add-drm
2 parents c8d80ca + 097c899 commit c93ba23

File tree

1,850 files changed

+49930
-21601
lines changed

Some content is hidden

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

1,850 files changed

+49930
-21601
lines changed

.github/CODEOWNERS

+4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
/packages/@expo/cli @EvanBacon @bycedric
22
/packages/@expo/config @EvanBacon
3+
/packages/@expo/env @EvanBacon @bycedric
34
/packages/@expo/prebuild-config @EvanBacon
45
/packages/@expo/config-plugins @EvanBacon @brentvatne
56
/packages/@expo/config-types @EvanBacon @douglowder
7+
/packages/@expo/json-file @EvanBacon @bycedric
68
/packages/@expo/metro-config @EvanBacon @bycedric @marklawlor
79
/packages/@expo/metro-runtime @EvanBacon @bycedric @marklawlor
810
/packages/@expo/package-manager @EvanBacon @bycedric
911
/packages/babel-preset-expo @brentvatne @ide @EvanBacon
12+
/packages/create-expo @EvanBacon @bycedric
1013
/packages/expo-* @alanjhughes
1114
/packages/expo-app-loader-provider @tsapeta
1215
/packages/expo-apple-authentication @tsapeta
@@ -33,6 +36,7 @@
3336
/packages/expo-dev-menu-interface @lukmccall @douglowder @gabrieldonadel
3437
/packages/expo-device @ide @tsapeta
3538
/packages/expo-document-picker @lukmccall
39+
/packages/expo-env-info @bycedric @kbrandwijk
3640
/packages/expo-face-detector @kudo
3741
/packages/expo-file-system @brentvatne @kudo @ide @tsapeta
3842
/packages/expo-font @tsapeta

.github/workflows/android-instrumentation-tests.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
- packages/expo-json-utils/android/**
1414
- packages/expo-manifests/android/**
1515
- packages/expo-updates/android/**
16+
- tools/src/commands/AndroidNativeUnitTests.ts
1617
- yarn.lock
1718
- '!packages/@expo/cli/**'
1819
pull_request:
@@ -25,6 +26,7 @@ on:
2526
- packages/expo-json-utils/android/**
2627
- packages/expo-manifests/android/**
2728
- packages/expo-updates/android/**
29+
- tools/src/commands/AndroidNativeUnitTests.ts
2830
- yarn.lock
2931
- '!packages/@expo/cli/**'
3032

@@ -46,7 +48,7 @@ jobs:
4648
- name: ⬢ Setup Node
4749
uses: actions/setup-node@v3
4850
with:
49-
node-version: 16
51+
node-version: 18
5052
- name: 👀 Check out repository
5153
uses: actions/checkout@v3
5254
with:
@@ -63,7 +65,6 @@ jobs:
6365
gradle: 'true'
6466
yarn-workspace: 'true'
6567
yarn-tools: 'true'
66-
hermes-engine-aar: 'true'
6768
react-native-gradle-downloads: 'true'
6869
- name: ➕ Add `bin` to GITHUB_PATH
6970
run: echo "$(pwd)/bin" >> $GITHUB_PATH

.github/workflows/android-unit-tests.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,24 @@ jobs:
3737
- name: ⬢ Setup Node
3838
uses: actions/setup-node@v3
3939
with:
40-
node-version: 16
40+
node-version: 18
4141
- name: 👀 Check out repository
4242
uses: actions/checkout@v3
4343
with:
4444
submodules: true
4545
- name: 🧹 Cleanup GitHub Linux runner disk space
4646
uses: ./.github/actions/cleanup-linux-disk-space
47-
- name: 🔨 Use JDK 11
47+
- name: 🔨 Use JDK 17
4848
uses: actions/setup-java@v3
4949
with:
5050
distribution: 'temurin'
51-
java-version: '11'
51+
java-version: '17'
5252
- name: ♻️ Restore caches
5353
uses: ./.github/actions/expo-caches
5454
id: expo-caches
5555
with:
5656
yarn-workspace: 'true'
5757
yarn-tools: 'true'
58-
hermes-engine-aar: 'true'
5958
react-native-gradle-downloads: 'true'
6059
- name: ➕ Add `bin` to GITHUB_PATH
6160
run: echo "$(pwd)/bin" >> $GITHUB_PATH

.github/workflows/cli.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- packages/@expo/config/src/**
1212
- packages/@expo/config-plugins/src/**
1313
- packages/@expo/env/src/**
14+
- packages/@expo/json-file/src/**
1415
- packages/@expo/package-manager/src/**
1516
- packages/@expo/prebuild-config/src/**
1617
- packages/@expo/server/src/**
@@ -26,6 +27,7 @@ on:
2627
- packages/@expo/config/src/**
2728
- packages/@expo/config-plugins/src/**
2829
- packages/@expo/env/src/**
30+
- packages/@expo/json-file/src/**
2931
- packages/@expo/package-manager/src/**
3032
- packages/@expo/prebuild-config/src/**
3133
- packages/@expo/server/src/**
@@ -53,7 +55,9 @@ jobs:
5355
- name: 🏗️ Setup Bun
5456
uses: oven-sh/setup-bun@v1
5557
with:
56-
bun-version: 1.x
58+
# Version `1.x` fails due to https://github.com/oven-sh/setup-bun/issues/37
59+
# TODO(cedric): swap `latest` back once the issue is resolved
60+
bun-version: latest
5761
- name: ♻️ Restore caches
5862
uses: ./.github/actions/expo-caches
5963
id: expo-caches
@@ -65,9 +69,6 @@ jobs:
6569
- name: 🔎 Type Check CLI
6670
run: yarn typecheck
6771
working-directory: packages/@expo/cli
68-
- name: 🛠 Build CLI
69-
run: yarn prepare
70-
working-directory: packages/@expo/cli
7172
- name: E2E Test CLI
7273
run: yarn test:e2e
7374
working-directory: packages/@expo/cli

.github/workflows/client-android-eas.yml

+13-9
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,13 @@ on:
2222
paths:
2323
- .github/workflows/client-android-eas.yml
2424
- apps/eas-expo-go/**
25-
- android/versioned-abis/**
26-
- android/versioned-react-native/**
27-
- android/expoview/**
28-
- android/**/*.gradle
25+
- android/**
2926
push:
3027
branches: [main, sdk-*]
3128
paths:
3229
- .github/workflows/client-android-eas.yml
3330
- apps/eas-expo-go/**
34-
- android/versioned-abis/**
35-
- android/versioned-react-native/**
36-
- android/expoview/**
37-
- android/**/*.gradle
31+
- android/**
3832

3933
concurrency:
4034
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
@@ -123,7 +117,6 @@ jobs:
123117
profile: ${{ steps.profile.outputs.profile }}
124118
projectRoot: './apps/eas-expo-go'
125119
expoToken: ${{ secrets.EAS_BUILD_BOT_TOKEN }}
126-
noWait: ${{ github.event.schedule }}
127120
message: ${{ github.event.pull_request.title }}
128121
- name: On workflow canceled
129122
if: ${{ cancelled() && steps.build.outputs.build_id }}
@@ -132,3 +125,14 @@ jobs:
132125
env:
133126
EXPO_TOKEN: ${{ secrets.EAS_BUILD_BOT_TOKEN }}
134127
EAS_BUILD_PROFILE: ${{ steps.profile.outputs.profile }}
128+
- name: 🔔 Notify on Slack
129+
uses: 8398a7/action-slack@v3
130+
if: failure() && (github.event_name == 'schedule' || github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
131+
env:
132+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
133+
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_android }}
134+
with:
135+
channel: '#expo-android'
136+
status: ${{ job.status }}
137+
fields: job,message,ref,eventName,author,took
138+
author_name: Expo Go (Android)

.github/workflows/client-android.yml

-117
This file was deleted.

.github/workflows/client-ios-eas.yml

+11-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ on:
2828
- secrets/**
2929
- fastlane/**
3030
- Gemfile.lock
31-
- yarn.lock
3231
push:
3332
branches: [main, sdk-*]
3433
paths:
@@ -40,7 +39,6 @@ on:
4039
- secrets/**
4140
- fastlane/**
4241
- Gemfile.lock
43-
- yarn.lock
4442

4543
concurrency:
4644
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.ref }}
@@ -106,7 +104,6 @@ jobs:
106104
profile: ${{ steps.profile.outputs.profile }}
107105
projectRoot: './apps/eas-expo-go'
108106
expoToken: ${{ secrets.EAS_BUILD_BOT_TOKEN }}
109-
noWait: ${{ github.event.schedule }}
110107
message: ${{ github.event.pull_request.title }}
111108
- name: On workflow canceled
112109
if: ${{ cancelled() && steps.build.outputs.build_id }}
@@ -115,3 +112,14 @@ jobs:
115112
env:
116113
EXPO_TOKEN: ${{ secrets.EAS_BUILD_BOT_TOKEN }}
117114
EAS_BUILD_PROFILE: ${{ steps.profile.outputs.profile }}
115+
- name: 🔔 Notify on Slack
116+
uses: 8398a7/action-slack@v3
117+
if: failure() && (github.event_name == 'schedule' || github.event.ref == 'refs/heads/main' || startsWith(github.event.ref, 'refs/heads/sdk-'))
118+
env:
119+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
120+
SLACK_WEBHOOK_URL: ${{ secrets.slack_webhook_ios }}
121+
with:
122+
channel: '#expo-ios'
123+
status: ${{ job.status }}
124+
fields: job,message,ref,eventName,author,took
125+
author_name: Expo Go (iOS)

0 commit comments

Comments
 (0)