Fix pipeline (#49)

* run on push * add flutterfire * change job * upload aab artifact * upload aab artifact * fix cmd * run on main
canopas · Jun 19, 2024 · 9181787 · 9181787
1 parent 5dd3067
commit 9181787
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 16 deletions.
diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -1,18 +1,16 @@
 name: Android Build APK
 
 on:
-  workflow_dispatch:
   push:
     branches:
       - main
+  workflow_dispatch:
 
 jobs:
-
-  build:
+  android_build_apk:
     runs-on: ubuntu-latest
 
     steps:
-
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -45,15 +43,14 @@ jobs:
           echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
           echo $GOOGLE_SERVICES_JSON_BASE64 | base64 -di > android/app/google-services.json
 
-
       - name: Install Dependencies
         run: |
           cd data && flutter clean && flutter pub get
           cd ../style && flutter clean && flutter pub get
           cd ../khelo && flutter clean && flutter pub get
           cd ..
 
-      - name: Deploy Internally
+      - name: Generate Build
         env:
           APKSIGN_KEYSTORE_BASE64: ${{ secrets.APKSIGN_KEYSTORE_BASE64 }}
           APKSIGN_KEYSTORE_PASS: ${{ secrets.APKSIGN_KEYSTORE_PASS }}
@@ -83,5 +80,78 @@ jobs:
           name: Khelo APK
           path: Khelo*.apk
           retention-days: 2
-
 
+  android_build_aab:
+      runs-on: ubuntu-latest
+      needs: android_build_apk
+
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+
+        - name: Set up JDK 1.8
+          uses: actions/setup-java@v4
+          with:
+            distribution: 'oracle'
+            java-version: 17.0.6
+            cache: 'gradle'
+
+        - name: Set up Flutter SDK
+          uses: subosito/flutter-action@v2
+          with:
+            channel: stable
+            cache: true
+
+        - name: Set up ruby env
+          uses: ruby/setup-ruby@v1
+          with:
+            ruby-version: 3.3.0
+            bundler-cache: true
+
+        - name: Retrieve the secret and decode it to file
+          env:
+            FIREBASE_OPTIONS_BASE64: ${{ secrets.FIREBASE_OPTIONS_BASE64 }}
+            GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
+
+          run: |
+            cd khelo
+            echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
+            echo $GOOGLE_SERVICES_JSON_BASE64 | base64 -di > android/app/google-services.json
+
+        - name: Install Dependencies
+          run: |
+            cd data && flutter clean && flutter pub get
+            cd ../style && flutter clean && flutter pub get
+            cd ../khelo && flutter clean && flutter pub get
+            cd ..
+
+        - name: Generate build
+          env:
+            APKSIGN_KEYSTORE_BASE64: ${{ secrets.APKSIGN_KEYSTORE_BASE64 }}
+            APKSIGN_KEYSTORE_PASS: ${{ secrets.APKSIGN_KEYSTORE_PASS }}
+            APKSIGN_KEY_ALIAS: ${{ secrets.APKSIGN_KEY_ALIAS }}
+            APKSIGN_KEY_PASS: ${{ secrets.APKSIGN_KEY_PASS }}
+
+          run: |
+            echo  $APKSIGN_KEYSTORE_BASE64 | base64 -di > release.keystore
+            export APKSIGN_KEYSTORE=`pwd`/release.keystore
+            cd khelo
+            file='VERSION'
+            fileData=`cat $file`
+            IFS='.'
+            read -a versionValue <<< "$fileData"
+            buildNumber=$(( ${versionValue[0]} * 1000000 + ${versionValue[1]} * 10000 + ${{ github.run_number }} ))
+            IFS=''
+            buildName="${versionValue[0]}.${versionValue[1]}.${{ github.run_number }}"
+            echo "Generating android build $buildName $buildNumber"          
+            flutter build appbundle --build-number=$buildNumber --build-name=$buildName
+
+            cd ..
+            mv khelo/build/app/outputs/bundle/release/app-release.aab .
+
+        - name: Upload AAB Artifact
+          uses: actions/upload-artifact@v4
+          with:
+            name: Khelo AAB
+            path: app-release.aab
+            retention-days: 2
diff --git a/.github/workflows/android_deploy.yml b/.github/workflows/android_deploy.yml
@@ -7,12 +7,10 @@ on:
   workflow_dispatch:
 
 jobs:
-
-  build:
+  deploy_internal_android:
     runs-on: ubuntu-latest
 
     steps:
-
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -45,7 +43,6 @@ jobs:
           echo $FIREBASE_OPTIONS_BASE64 | base64 -di > lib/firebase_options.dart
           echo $GOOGLE_SERVICES_JSON_BASE64 | base64 -di > android/app/google-services.json
 
-
       - name: Install Dependencies
         run: |
           cd data && flutter clean && flutter pub get
@@ -78,8 +75,4 @@ jobs:
           bundle install
           echo $APP_PLAY_SERVICE_JSON | base64 -di > google_play_api_key.json
           bundle exec fastlane supply init --track internal
-          bundle exec fastlane upload_internal versionName:$buildName versionCode:$buildNumber
-          
-
-
-
+          bundle exec fastlane upload_internal versionName:$buildName versionCode:$buildNumber
diff --git a/.github/workflows/ios_deploy.yml b/.github/workflows/ios_deploy.yml
@@ -57,6 +57,9 @@ jobs:
     - name: Install Codemagic CLI tools
       run: pip install codemagic-cli-tools
 
+    - name: install flutterfire CLI
+      run: dart pub global activate flutterfire_cli
+
     - name: Set up keychain
       run: keychain initialize
 

diff --git a/khelo/ios/Runner/Info.plist b/khelo/ios/Runner/Info.plist
@@ -48,6 +48,7 @@
 	<key>UIBackgroundModes</key>
 	<array>
 		<string>fetch</string>
+		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen</string>