merged main

thinknimble · Aug 15, 2024 · a11d780 · a11d780
2 parents d58fe09 + 4afeee9
commit a11d780
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml
@@ -125,4 +125,4 @@ jobs:
       #   working-directory: ./my_project/mobile
 
       #   run: |
-      #     eas build --platform ios --profile ${{ env.PR_NUMBER }} && eas update --branch="${{ env.EXPO_NAME }}" --non-interactive --auto
+      #     eas build --platform ios --profile ${{ env.PR_NUMBER }} && eas update --branch="${{ env.EXPO_NAME }}" --non-interactive --auto
diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/Config.js b/{{cookiecutter.project_slug}}/clients/mobile/react-native/Config.js
@@ -73,6 +73,7 @@ const ENV = () => {
 }
 
 const Config = { ...ENV() }
+<<<<<<< HEAD
 export default Config
 
 export const vars = {
@@ -82,4 +83,7 @@ export const vars = {
   backendServerUrl,
   rollbarAccessToken,
   sentryDSN,
-}
+}
+=======
+export default Config
+>>>>>>> main
diff --git a/{{cookiecutter.project_slug}}/clients/mobile/react-native/eas.json b/{{cookiecutter.project_slug}}/clients/mobile/react-native/eas.json
@@ -52,6 +52,10 @@
       "autoIncrement": true,
       "env": {
         "BACKEND_SERVER_URL": "<REPLACE_WITH_PRODUCTION_BACKEND_SERVER_URL>",
+<<<<<<< HEAD
+=======
+        "BUILD_ENV": "production",
+>>>>>>> main
         "ROLLBAR_ACCESS_TOKEN": "<REPLACE_WITH_PRODUCTION_ROLLBAR_TOKEN>",
         "SENTRY_DSN": "<REPLACE_WITH_PRODUCTION_SENTRY_DSN>"
       }