Bladeren bron

Use env variable to identify Github APKs

Neeraj Gupta 2 jaren geleden
bovenliggende
commit
4d13ca6c1d
2 gewijzigde bestanden met toevoegingen van 4 en 6 verwijderingen
  1. 2 2
      .github/workflows/ci.yml
  2. 2 4
      lib/services/update_service.dart

+ 2 - 2
.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
 
             # Build independent apk.
             - name: Build
-              run: flutter build apk --release --flavor independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-auth.apk
+              run: flutter build apk --release --flavor independent --dart-define=app.flavor=independent && mv build/app/outputs/flutter-apk/app-independent-release.apk build/app/outputs/flutter-apk/ente-auth.apk
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}
@@ -50,7 +50,7 @@ jobs:
 
             # Build Play store aab.
             - name: Build
-              run: flutter build appbundle --release --flavor playstore
+              run: flutter build appbundle --release --flavor playstore --dart-define=app.flavor=playstore
               env:
                   SIGNING_KEY_PATH: "/home/runner/work/_temp/keystore/ente_auth_key.jks"
                   SIGNING_KEY_ALIAS: ${{ secrets.SIGNING_KEY_ALIAS }}

+ 2 - 4
lib/services/update_service.dart

@@ -16,6 +16,7 @@ class UpdateService {
 
   static final UpdateService instance = UpdateService._privateConstructor();
   static const kUpdateAvailableShownTimeKey = "update_available_shown_time_key";
+  static const String flavor = String.fromEnvironment('app.flavor');
 
   LatestVersionInfo? _latestVersion;
   final _logger = Logger("UpdateService");
@@ -105,10 +106,7 @@ class UpdateService {
   }
 
   bool isIndependent() {
-    if (Platform.isIOS) {
-      return false;
-    }
-    return kDebugMode || _packageInfo.packageName.endsWith("independent");
+    return flavor == "independent" || _packageInfo.packageName.endsWith("independent");
   }
 }