forked from
jollywhoppers.com/witchsky.app
Bluesky app fork with some witchin' additions 💫
switch mmkv version before android eas bundle (#8526)
+35
-18
+3
-3
.github/workflows/build-submit-android.yml
+3
-3
.github/workflows/build-submit-android.yml
···
52
52
distribution: 'temurin'
53
53
java-version: '17'
54
54
55
-
# - name: "Use upgraded MMKV for Fabric"
56
-
# run: |
57
-
# sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
55
+
- name: "Use upgraded MMKV for Fabric"
56
+
run: |
57
+
sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
58
58
59
59
- name: ⚙️ Install dependencies
60
60
run: yarn install
+12
-4
.github/workflows/bundle-deploy-eas-update.yml
+12
-4
.github/workflows/bundle-deploy-eas-update.yml
···
5
5
push:
6
6
branches:
7
7
- main
8
+
- hailey/eas-fab
8
9
workflow_dispatch:
9
10
inputs:
10
11
channel:
···
118
119
119
120
- name: 🏗️ Create Bundle
120
121
if: ${{ !steps.fingerprint.outputs.includes-changes }}
121
-
run: SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export
122
+
run: |
123
+
SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export-ios
124
+
mv ./dist ./ios-dist
125
+
sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
126
+
yarn install
127
+
SENTRY_DIST=${{ steps.sentry.outputs.SENTRY_DIST }} SENTRY_RELEASE=${{ steps.sentry.outputs.SENTRY_RELEASE }} SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }} SENTRY_DSN=${{ secrets.SENTRY_DSN }} EXPO_PUBLIC_ENV="${{ inputs.channel || 'testflight' }}" yarn export-android
128
+
mv ./dist ./android-dist
129
+
122
130
123
131
- name: 📦 Package Bundle and 🚀 Deploy
124
132
if: ${{ !steps.fingerprint.outputs.includes-changes }}
···
275
283
distribution: 'temurin'
276
284
java-version: '17'
277
285
278
-
# - name: "Use upgraded MMKV for Fabric"
279
-
# run: |
280
-
# sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
286
+
- name: "Use upgraded MMKV for Fabric"
287
+
run: |
288
+
sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json
281
289
282
290
- name: ⚙️ Install dependencies
283
291
run: yarn install
+1
-1
app.config.js
+1
-1
app.config.js
+2
-1
package.json
+2
-1
package.json
···
61
61
"intl:push": "crowdin push translations --verbose -b main",
62
62
"nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android",
63
63
"update-extensions": "bash scripts/updateExtensions.sh",
64
-
"export": "npx expo export --dump-sourcemap && yarn upload-native-sourcemaps",
64
+
"export-ios": "npx expo export --platform ios --dump-sourcemap && yarn upload-native-sourcemaps",
65
+
"export-android": "npx expo export --platform android --dump-sourcemap && yarn upload-native-sourcemaps",
65
66
"upload-native-sourcemaps": "npx sentry-expo-upload-sourcemaps dist",
66
67
"make-deploy-bundle": "bash scripts/bundleUpdate.sh",
67
68
"generate-webpack-stats-file": "EXPO_PUBLIC_GENERATE_STATS=1 yarn build-web",
+17
-9
scripts/bundleUpdate.js
+17
-9
scripts/bundleUpdate.js
···
3
3
const fsp = fs.promises
4
4
const path = require('path')
5
5
6
-
const DIST_DIR = './dist'
6
+
const IOS_DIST_DIR = './ios-dist'
7
+
const ANDROID_DIST_DIR = './android-dist'
8
+
7
9
const BUNDLES_DIR = '/_expo/static/js'
8
-
const IOS_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/ios')
9
-
const ANDROID_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/android')
10
-
const METADATA_PATH = path.join(DIST_DIR, '/metadata.json')
10
+
11
+
const IOS_BUNDLE_DIR = path.join(IOS_DIST_DIR, BUNDLES_DIR, '/ios')
12
+
const ANDROID_BUNDLE_DIR = path.join(ANDROID_DIST_DIR, BUNDLES_DIR, '/android')
13
+
14
+
const IOS_METADATA_PATH = path.join(IOS_DIST_DIR, '/metadata.json')
15
+
const ANDROID_METADATA_PATH = path.join(ANDROID_DIST_DIR, '/metadata.json')
16
+
11
17
const DEST_DIR = './bundleTempDir'
12
18
13
19
// Weird, don't feel like figuring out _why_ it wants this
14
-
const METADATA = require(`../${METADATA_PATH}`)
15
-
const IOS_METADATA_ASSETS = METADATA.fileMetadata.ios.assets
16
-
const ANDROID_METADATA_ASSETS = METADATA.fileMetadata.android.assets
20
+
const IOS_METADATA = require(`../${IOS_METADATA_PATH}`)
21
+
const ANDROID_METADATA = require(`../${ANDROID_METADATA_PATH}`)
22
+
23
+
const IOS_METADATA_ASSETS = IOS_METADATA.fileMetadata.ios.assets
24
+
const ANDROID_METADATA_ASSETS = ANDROID_METADATA.fileMetadata.android.assets
17
25
18
26
const getMd5 = async path => {
19
27
return new Promise(res => {
···
60
68
61
69
console.log('Getting ios asset md5s and moving them...')
62
70
for (const asset of IOS_METADATA_ASSETS) {
63
-
const currPath = path.join(DIST_DIR, asset.path)
71
+
const currPath = path.join(IOS_DIST_DIR, asset.path)
64
72
const md5 = await getMd5(currPath)
65
73
const withExtPath = `assets/${md5}.${asset.ext}`
66
74
iosAssets.push(withExtPath)
···
69
77
70
78
console.log('Getting android asset md5s and moving them...')
71
79
for (const asset of ANDROID_METADATA_ASSETS) {
72
-
const currPath = path.join(DIST_DIR, asset.path)
80
+
const currPath = path.join(ANDROID_DIST_DIR, asset.path)
73
81
const md5 = await getMd5(currPath)
74
82
const withExtPath = `assets/${md5}.${asset.ext}`
75
83
androidAssets.push(withExtPath)