Merge branch 'main' of https://github.com/maheshmnj/vocabhub

maheshj01 · Jul 8, 2024 · 521e2ca · 521e2ca
2 parents 39a2cad + c8de6f7
commit 521e2ca
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/.github/workflows/firebase-hosting-merge.yml b/.github/workflows/firebase-hosting-merge.yml
@@ -2,10 +2,11 @@
 # https://github.com/firebase/firebase-tools
 
 name: Build and Deploy
-"on":
+on:
   push:
     branches:
       - main
+
 jobs:
   build_and_deploy:
     runs-on: ubuntu-latest
@@ -33,19 +34,14 @@ jobs:
       - run: echo $FIREBASE_UTILS_OPTIONS | base64 -d > lib/utils/firebase_options.dart
         env:
           FIREBASE_UTILS_OPTIONS: ${{ secrets.FIREBASE_UTILS_OPTIONS }}
+
       - run: flutter clean
       - run: flutter pub get
-      # Use the setup-shorebird action to configure Shorebird
-      - name: 🐦 Setup Shorebird
-        uses: shorebirdtech/setup-shorebird@v1
 
-      - name: Publish Shorebird Patch
-        env:
-          SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
-        run: shorebird patch android --release-version  0.7.8+30 -- --dart-define=SUPABASE_PROJECT_URL=${{secrets.SUPABASE_PROJECT_URL}} --dart-define=SUPABASE_API_KEY=${{secrets.SUPABASE_API_KEY}} --dart-define=SUPABASE_REDIRECT_URL=${{secrets.SUPABASE_REDIRECT_URL}} --dart-define=FIREBASE_VAPID_KEY=${{ secrets.FIREBASE_VAPID_KEY }}--dart-define=ADMIN_EMAIL=${{ secrets.ADMIN_EMAIL }} --dart-define=FCM_SERVER_KEY=${{ secrets.FCM_SERVER_KEY }}
+      # Build and Deploy to Firebase
+      - name: Build Flutter Web
+        run: flutter build web --release --dart-define=SUPABASE_PROJECT_URL=${{ secrets.SUPABASE_PROJECT_URL }} --dart-define=SUPABASE_API_KEY=${{ secrets.SUPABASE_API_KEY }} --dart-define=SUPABASE_REDIRECT_URL=${{ secrets.SUPABASE_REDIRECT_URL }} --dart-define=SUPABASE_SERVICE_ROLE=${{ secrets.SUPABASE_SERVICE_ROLE }} --dart-define=FIREBASE_VAPID_KEY=${{ secrets.FIREBASE_VAPID_KEY }} --dart-define=ADMIN_EMAIL=${{ secrets.ADMIN_EMAIL }} --dart-define=FCM_SERVER_KEY=${{ secrets.FCM_SERVER_KEY }}
 
-      # - run: flutter pub run build_runner build --delete-conflicting-outputs
-      - run: flutter build web --release --dart-define=SUPABASE_PROJECT_URL=${{secrets.SUPABASE_PROJECT_URL}} --dart-define=SUPABASE_API_KEY=${{secrets.SUPABASE_API_KEY}} --dart-define=SUPABASE_REDIRECT_URL=${{secrets.SUPABASE_REDIRECT_URL}} --dart-define=SUPABASE_SERVICE_ROLE=${{secrets.SUPABASE_SERVICE_ROLE}} --dart-define=FIREBASE_VAPID_KEY=${{ secrets.FIREBASE_VAPID_KEY }} --dart-define=ADMIN_EMAIL=${{ secrets.ADMIN_EMAIL }} --dart-define=FCM_SERVER_KEY=${{ secrets.FCM_SERVER_KEY }}
       - uses: FirebaseExtended/action-hosting-deploy@v0
         with:
           repoToken: "${{ secrets.GITHUB_TOKEN }}"
@@ -55,7 +51,18 @@ jobs:
         env:
           FIREBASE_CLI_PREVIEWS: hostingchannels
 
-        # test integration test
+      # Use the setup-shorebird action to configure Shorebird
+      - name: 🐦 Setup Shorebird
+        uses: shorebirdtech/setup-shorebird@v1
+
+      - name: Publish Shorebird Patch
+        env:
+          SHOREBIRD_TOKEN: ${{ secrets.SHOREBIRD_TOKEN }}
+        run: shorebird patch android --release-version 0.7.9+31 -- --dart-define=SUPABASE_PROJECT_URL=${{ secrets.SUPABASE_PROJECT_URL }} --dart-define=SUPABASE_API_KEY=${{ secrets.SUPABASE_API_KEY }} --dart-define=SUPABASE_REDIRECT_URL=${{ secrets.SUPABASE_REDIRECT_URL }} --dart-define=FIREBASE_VAPID_KEY=${{ secrets.FIREBASE_VAPID_KEY }} --dart-define=ADMIN_EMAIL=${{ secrets.ADMIN_EMAIL }} --dart-define=FCM_SERVER_KEY=${{ secrets.FCM_SERVER_KEY }}
+
+
+      # - run: flutter pub run build_runner build --delete-conflicting-outputs
+      # test integration test
       # - name: 📦 Install dependencies
       #   run: flutter pub get
       # - name: 📱 Run integration test