fix: use staging.didroom in test envoiroment (#72)

* fix: use staging.didroom in test envoiroment * fix: point github version to production backend --------- Co-authored-by: matteo-cristino <[email protected]>
ForkbombEu · Oct 4, 2024 · e63c2b2 · e63c2b2
1 parent ef01654
commit e63c2b2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/.env.example b/.env.example
@@ -1 +1 @@
-PUBLIC_BACKEND_URL='https://admin.didroom.com'
+PUBLIC_BACKEND_URL='https://staging.admin.didroom.com'
diff --git a/.github/workflows/build_alpha_release.yml b/.github/workflows/build_alpha_release.yml
@@ -51,6 +51,7 @@ jobs:
           KEYSTORE_KEY_ALIAS: ${{ secrets.KEYSTORE_KEY_ALIAS }}
           KEYSTORE_KEY_PASSWORD: ${{ secrets.KEYSTORE_KEY_PASSWORD }}
           KEYSTORE_STORE_PASSWORD: ${{ secrets.KEYSTORE_STORE_PASSWORD }}
+          PUBLIC_BACKEND_URL: ${{ vars.PUBLIC_BACKEND_URL }}
         with:
           lane: alpha
       - run: mv release.apk verifier.apk
@@ -98,7 +99,7 @@ jobs:
           fi
           echo "Result"
           cat $GITHUB_OUTPUT
-  
+
   draft-release:
     permissions:
       contents: write

diff --git a/.github/workflows/distribute.yml b/.github/workflows/distribute.yml
@@ -51,5 +51,6 @@ jobs:
           FIREBASE_APP_ID: ${{ secrets.FIREBASE_APP_ID }}
           PULL_REQUEST_NUMBER: ${{ github.event.number }}
           PULL_REQUEST_TITLE: ${{ github.event.pull_request.title }}
+          PUBLIC_BACKEND_URL: ${{ vars.PUBLIC_BACKEND_URL }}
         with:
           lane: distribute
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -25,6 +25,7 @@ FIREBASE_APP_ID = ENV["FIREBASE_APP_ID"]
 SERVICE_ACCOUNT_PATH = ENV["SERVICE_ACCOUNT_PATH"]
 PULL_REQUEST_NUMBER = ENV["PULL_REQUEST_NUMBER"]
 PULL_REQUEST_TITLE = ENV["PULL_REQUEST_TITLE"]
+PUBLIC_BACKEND_URL = ENV["PUBLIC_BACKEND_URL"]
 
 
 platform :android do
@@ -33,7 +34,6 @@ platform :android do
   lane :alpha do
     sh "pnpm install -g @ionic/cli"
     sh "pnpm install"
-    sh "cp ../.env.example ../.env"
     sh "ionic cap sync android"
     sh "ionic cap build android --no-open"
     gradle(
@@ -63,7 +63,6 @@ platform :android do
   lane :distribute do
     sh "pnpm install -g @ionic/cli"
     sh "pnpm install"
-    sh "cp ../.env.example ../.env"
     sh "ionic cap sync android"
     sh "ionic cap build android --no-open"
     package = load_json(json_path: "./package.json")

diff --git a/src/lib/backendUri.ts b/src/lib/backendUri.ts
@@ -4,7 +4,7 @@ const api = '/api';
 const files = `${api}/files`;
 const userCollectionId = '_pb_users_auth_';
 
-export const backendUri = PUBLIC_BACKEND_URL || 'https://admin.didroom.com';
+export const backendUri = PUBLIC_BACKEND_URL || 'https://staging.admin.didroom.com';
 export const filesUri = (fileName: string, collection: string, id: string) =>
 	`${backendUri}${files}/${collection}/${id}/${fileName}`;
 export const authFilesUri = (fileName: string | undefined, userId: string | undefined) =>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		PUBLIC_BACKEND_URL='https://admin.didroom.com'
		PUBLIC_BACKEND_URL='https://staging.admin.didroom.com'