Merge remote-tracking branch 'origin/main'

Turtlepaw · Oct 22, 2024 · 287c8b4 · 287c8b4
2 parents 3b498bd + dcbfa37
commit 287c8b4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,7 +16,7 @@ jobs:
         channel: stable
     - run: flutter pub get
     #- run: flutter test
-    - run: flutter build apk --debug --flavor debugVariant ##--split-per-abi
+    - run: flutter build apk --debug ##--split-per-abi
     - name: Upload APK
       uses: actions/upload-artifact@v4
       with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,15 +36,15 @@ jobs:
 
       - name: Build APK
         if: ${{ github.event.inputs.buildType == 'apk' }}
-        run: flutter build apk --flavor ciRelease --release
+        run: flutter build apk --release
         env:
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
           KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
 
       - name: Build AAB
         if: ${{ github.event.inputs.buildType == 'aab' }}
-        run: flutter build appbundle --flavor ciRelease --release
+        run: flutter build appbundle --release
         env:
           KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
           KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -63,5 +63,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: AAB
-          path: build/app/outputs/bundle/ciReleaseRelease/*.aab
+          path: build/app/outputs/bundle/release/*.aab
           compression-level: 0
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -58,10 +58,10 @@ android {
         release {
             if (System.getenv("CI") != null) {
                 // CI environment, use keystore from environment variables
-                keyAlias System.getenv("KEY_ALIAS")
-                keyPassword System.getenv("KEY_PASSWORD")
-                storeFile file(System.getenv("KEYSTORE_PATH"))
-                storePassword System.getenv("KEYSTORE_PASSWORD")
+            storeFile file("keystore.jks")
+            storePassword System.getenv("KEYSTORE_PASSWORD")
+            keyAlias System.getenv("KEY_ALIAS")
+            keyPassword System.getenv("KEY_PASSWORD")
             } else {
                 // Local environment, use key.properties
                 def keystoreProperties = new Properties()