Merge pull request #177 from Crossbell-Box/develop

fix: update CI yml.
Crossbell-Box · Jul 4, 2023 · 220432d · 220432d
2 parents 182ae40 + 9ac9ef1
commit 220432d
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 143 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -43,12 +43,12 @@ jobs:
           echo "${{ secrets.ENV_FILE_DEVELOPMENT }}" > .env.development
           echo "${{ secrets.ENV_FILE_PRODUCTION }}" > .env.production
           echo "${{ secrets.ENV_FILE_STAGING }}" > .env.staging
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > ANDROID_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > ANDROID_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > ANDROID_GOOGLE_SERVICES_PRODUCTION
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > IOS_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > IOS_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > IOS_GOOGLE_SERVICES_PRODUCTION
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > google-services.development.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > google-services.staging.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > google-services.production.json
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > GoogleService-Info.development.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > GoogleService-Info.staging.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > GoogleService-Info.production.plist
 
       - name: Install Dependencies
         run: yarn

diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml
@@ -51,12 +51,12 @@ jobs:
           echo "${{ secrets.ENV_FILE_DEVELOPMENT }}" > .env.development
           echo "${{ secrets.ENV_FILE_PRODUCTION }}" > .env.production
           echo "${{ secrets.ENV_FILE_STAGING }}" > .env.staging
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > ANDROID_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > ANDROID_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > ANDROID_GOOGLE_SERVICES_PRODUCTION
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > IOS_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > IOS_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > IOS_GOOGLE_SERVICES_PRODUCTION
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > google-services.development.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > google-services.staging.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > google-services.production.json
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > GoogleService-Info.development.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > GoogleService-Info.staging.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > GoogleService-Info.production.plist
 
       - name: Install dependencies
         run: yarn install

diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml
@@ -40,12 +40,12 @@ jobs:
           echo "${{ secrets.ENV_FILE_DEVELOPMENT }}" > .env.development
           echo "${{ secrets.ENV_FILE_PRODUCTION }}" > .env.production
           echo "${{ secrets.ENV_FILE_STAGING }}" > .env.staging
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > ANDROID_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > ANDROID_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > ANDROID_GOOGLE_SERVICES_PRODUCTION
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > IOS_GOOGLE_SERVICES_DEVELOPMENT
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > IOS_GOOGLE_SERVICES_STAGING
-          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > IOS_GOOGLE_SERVICES_PRODUCTION
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_DEVELOPMENT }}" > google-services.development.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_STAGING }}" > google-services.staging.json
+          echo "${{ secrets.ANDROID_GOOGLE_SERVICES_PRODUCTION }}" > google-services.production.json
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_DEVELOPMENT }}" > GoogleService-Info.development.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_STAGING }}" > GoogleService-Info.staging.plist
+          echo "${{ secrets.IOS_GOOGLE_SERVICES_PRODUCTION }}" > GoogleService-Info.production.plist
 
       - name: Install dependencies
         run: yarn install

diff --git a/GOOGLE_SERVICES_DEVELOPMENT b/GOOGLE_SERVICES_DEVELOPMENT
diff --git a/GOOGLE_SERVICES_PRODUCTION b/GOOGLE_SERVICES_PRODUCTION
diff --git a/GOOGLE_SERVICES_STAGING b/GOOGLE_SERVICES_STAGING
diff --git a/scripts/set-app-config-env.js b/scripts/set-app-config-env.js
@@ -4,11 +4,11 @@ const { version } = require("../package.json");
 
 function setAppConfigEnv() {
   const ENV = process.env.NODE_ENV ?? "production";
-  const IS_CI = process.env.EAS_BUILD === "true" || process.env.CI === "true";
+  const IS_EAS_CI = process.env.EAS_BUILD === "true";
 
   console.log("ENV:", process.env);
 
-  if (IS_CI) {
+  if (IS_EAS_CI) {
     dotenv.config({ path: process.env.ENV_FILE_COMMON });
     dotenv.config({ path: process.env[`ENV_FILE_${ENV.toUpperCase()}`] });
   }
@@ -28,24 +28,24 @@ function setAppConfigEnv() {
       host: HOST,
       scheme: `${SCHEME}.development`,
       icon: "./assets/icon.development.png",
-      androidGoogleServicesFile: IS_CI ? process.env.ANDROID_GOOGLE_SERVICES_DEVELOPMENT : "./google-services.development.json",
-      iosGoogleServicesFile: IS_CI ? process.env.IOS_GOOGLE_SERVICES_DEVELOPMENT : "./GoogleService-Info.development.plist",
+      androidGoogleServicesFile: IS_EAS_CI ? process.env.ANDROID_GOOGLE_SERVICES_DEVELOPMENT : "./google-services.development.json",
+      iosGoogleServicesFile: IS_EAS_CI ? process.env.IOS_GOOGLE_SERVICES_DEVELOPMENT : "./GoogleService-Info.development.plist",
     },
     staging: {
       name: "xLog-preview",
       host: HOST,
       scheme: `${SCHEME}.staging`,
       icon: "./assets/icon.staging.png",
-      androidGoogleServicesFile: IS_CI ? process.env.ANDROID_GOOGLE_SERVICES_STAGING : "./google-services.staging.json",
-      iosGoogleServicesFile: IS_CI ? process.env.IOS_GOOGLE_SERVICES_STAGING : "./GoogleService-Info.staging.plist",
+      androidGoogleServicesFile: IS_EAS_CI ? process.env.ANDROID_GOOGLE_SERVICES_STAGING : "./google-services.staging.json",
+      iosGoogleServicesFile: IS_EAS_CI ? process.env.IOS_GOOGLE_SERVICES_STAGING : "./GoogleService-Info.staging.plist",
     },
     production: {
       name: "xLog",
       host: HOST,
       scheme: SCHEME,
       icon: "./assets/icon.png",
-      androidGoogleServicesFile: IS_CI ? process.env.ANDROID_GOOGLE_SERVICES_PRODUCTION : "./google-services.production.json",
-      iosGoogleServicesFile: IS_CI ? process.env.IOS_GOOGLE_SERVICES_PRODUCTION : "./GoogleService-Info.production.plist",
+      androidGoogleServicesFile: IS_EAS_CI ? process.env.ANDROID_GOOGLE_SERVICES_PRODUCTION : "./google-services.production.json",
+      iosGoogleServicesFile: IS_EAS_CI ? process.env.IOS_GOOGLE_SERVICES_PRODUCTION : "./GoogleService-Info.production.plist",
     },
   };