Update android build script

canopas · Oct 30, 2024 · e4b43c4 · e4b43c4
1 parent bdd2d09
commit e4b43c4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 99 deletions.
diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
@@ -1,10 +1,10 @@
 name: Android Build APK
 
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
+on: push
+#  push:
+#    branches:
+#      - main
+#  workflow_dispatch:
 
 jobs:
   android_build_apk:
@@ -80,78 +80,3 @@ 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
@@ -1,10 +1,10 @@
 name: Publish to Google Play Store
 
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
+on: push
+#  push:
+#    branches:
+#      - main
+#  workflow_dispatch:
 
 jobs:
   deploy_internal_android:
@@ -37,28 +37,24 @@ jobs:
         env:
           FIREBASE_OPTIONS_BASE64: ${{ secrets.FIREBASE_OPTIONS_BASE64 }}
           GOOGLE_SERVICES_JSON_BASE64: ${{ secrets.GOOGLE_SERVICES_JSON_BASE64 }}
+          APP_PLAY_SERVICE_JSON: ${{ secrets.APP_PLAY_SERVICE_JSON_BASE64 }}
+          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: |
           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: |
+          
+          echo Installing dependencies
           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
-        env:
-          APP_PLAY_SERVICE_JSON: ${{ secrets.APP_PLAY_SERVICE_JSON_BASE64 }}
-          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 Deploy Internally
           echo  $APKSIGN_KEYSTORE_BASE64 | base64 -di > release.keystore
           export APKSIGN_KEYSTORE=`pwd`/release.keystore
           cd khelo

diff --git a/khelo/lib/ui/flow/tournament/add/add_tournament_screen.dart b/khelo/lib/ui/flow/tournament/add/add_tournament_screen.dart
@@ -95,7 +95,7 @@ class _AddTournamentScreenState extends ConsumerState<AddTournamentScreen> {
       title: widget.editTournament == null
           ? context.l10n.add_tournament_screen_title
           : context.l10n.tournament_detail_edit_title,
-      actions: isOrganizer
+      actions: (widget.editTournament != null && isOrganizer)
           ? [
               actionButton(
                 context,