diff options
| -rw-r--r-- | .github/workflows/build-submit-android.yml | 6 | ||||
| -rw-r--r-- | .github/workflows/bundle-deploy-eas-update.yml | 16 | ||||
| -rw-r--r-- | app.config.js | 2 | ||||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | scripts/bundleUpdate.js | 26 |
5 files changed, 35 insertions, 18 deletions
diff --git a/.github/workflows/build-submit-android.yml b/.github/workflows/build-submit-android.yml index 8b0b88ceb..8a8388ee8 100644 --- a/.github/workflows/build-submit-android.yml +++ b/.github/workflows/build-submit-android.yml @@ -52,9 +52,9 @@ jobs: distribution: 'temurin' java-version: '17' -# - name: "Use upgraded MMKV for Fabric" -# run: | -# sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json + - name: "Use upgraded MMKV for Fabric" + run: | + sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json - name: ⚙️ Install dependencies run: yarn install diff --git a/.github/workflows/bundle-deploy-eas-update.yml b/.github/workflows/bundle-deploy-eas-update.yml index adc9650d7..1b2fba0b7 100644 --- a/.github/workflows/bundle-deploy-eas-update.yml +++ b/.github/workflows/bundle-deploy-eas-update.yml @@ -5,6 +5,7 @@ on: push: branches: - main + - hailey/eas-fab workflow_dispatch: inputs: channel: @@ -118,7 +119,14 @@ jobs: - name: 🏗️ Create Bundle if: ${{ !steps.fingerprint.outputs.includes-changes }} - 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 + 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-ios + mv ./dist ./ios-dist + sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json + yarn install + 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 + mv ./dist ./android-dist + - name: 📦 Package Bundle and 🚀 Deploy if: ${{ !steps.fingerprint.outputs.includes-changes }} @@ -275,9 +283,9 @@ jobs: distribution: 'temurin' java-version: '17' -# - name: "Use upgraded MMKV for Fabric" -# run: | -# sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json + - name: "Use upgraded MMKV for Fabric" + run: | + sed -i 's/"react-native-mmkv": "\^2\.12\.2"/"react-native-mmkv": "^3.3.0"/' package.json - name: ⚙️ Install dependencies run: yarn install diff --git a/app.config.js b/app.config.js index 0fa91f2ce..36af08415 100644 --- a/app.config.js +++ b/app.config.js @@ -219,7 +219,7 @@ module.exports = function (_config) { compileSdkVersion: 35, targetSdkVersion: 35, buildToolsVersion: '35.0.0', - newArchEnabled: false, + newArchEnabled: true, }, }, ], diff --git a/package.json b/package.json index 30f8b8f72..0d06c97d5 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,8 @@ "intl:push": "crowdin push translations --verbose -b main", "nuke": "rm -rf ./node_modules && rm -rf ./ios && rm -rf ./android", "update-extensions": "bash scripts/updateExtensions.sh", - "export": "npx expo export --dump-sourcemap && yarn upload-native-sourcemaps", + "export-ios": "npx expo export --platform ios --dump-sourcemap && yarn upload-native-sourcemaps", + "export-android": "npx expo export --platform android --dump-sourcemap && yarn upload-native-sourcemaps", "upload-native-sourcemaps": "npx sentry-expo-upload-sourcemaps dist", "make-deploy-bundle": "bash scripts/bundleUpdate.sh", "generate-webpack-stats-file": "EXPO_PUBLIC_GENERATE_STATS=1 yarn build-web", diff --git a/scripts/bundleUpdate.js b/scripts/bundleUpdate.js index 00217dcd7..a5f1fb641 100644 --- a/scripts/bundleUpdate.js +++ b/scripts/bundleUpdate.js @@ -3,17 +3,25 @@ const fs = require('fs') const fsp = fs.promises const path = require('path') -const DIST_DIR = './dist' +const IOS_DIST_DIR = './ios-dist' +const ANDROID_DIST_DIR = './android-dist' + const BUNDLES_DIR = '/_expo/static/js' -const IOS_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/ios') -const ANDROID_BUNDLE_DIR = path.join(DIST_DIR, BUNDLES_DIR, '/android') -const METADATA_PATH = path.join(DIST_DIR, '/metadata.json') + +const IOS_BUNDLE_DIR = path.join(IOS_DIST_DIR, BUNDLES_DIR, '/ios') +const ANDROID_BUNDLE_DIR = path.join(ANDROID_DIST_DIR, BUNDLES_DIR, '/android') + +const IOS_METADATA_PATH = path.join(IOS_DIST_DIR, '/metadata.json') +const ANDROID_METADATA_PATH = path.join(ANDROID_DIST_DIR, '/metadata.json') + const DEST_DIR = './bundleTempDir' // Weird, don't feel like figuring out _why_ it wants this -const METADATA = require(`../${METADATA_PATH}`) -const IOS_METADATA_ASSETS = METADATA.fileMetadata.ios.assets -const ANDROID_METADATA_ASSETS = METADATA.fileMetadata.android.assets +const IOS_METADATA = require(`../${IOS_METADATA_PATH}`) +const ANDROID_METADATA = require(`../${ANDROID_METADATA_PATH}`) + +const IOS_METADATA_ASSETS = IOS_METADATA.fileMetadata.ios.assets +const ANDROID_METADATA_ASSETS = ANDROID_METADATA.fileMetadata.android.assets const getMd5 = async path => { return new Promise(res => { @@ -60,7 +68,7 @@ const moveFiles = async () => { console.log('Getting ios asset md5s and moving them...') for (const asset of IOS_METADATA_ASSETS) { - const currPath = path.join(DIST_DIR, asset.path) + const currPath = path.join(IOS_DIST_DIR, asset.path) const md5 = await getMd5(currPath) const withExtPath = `assets/${md5}.${asset.ext}` iosAssets.push(withExtPath) @@ -69,7 +77,7 @@ const moveFiles = async () => { console.log('Getting android asset md5s and moving them...') for (const asset of ANDROID_METADATA_ASSETS) { - const currPath = path.join(DIST_DIR, asset.path) + const currPath = path.join(ANDROID_DIST_DIR, asset.path) const md5 = await getMd5(currPath) const withExtPath = `assets/${md5}.${asset.ext}` androidAssets.push(withExtPath) |