From 98e4dade9f7dcf9f74178955bd471718f03ccb55 Mon Sep 17 00:00:00 2001
From: Ahmed Hnewa <73608287+freshtechtips@users.noreply.github.com>
Date: Sat, 21 Oct 2023 21:04:51 +0300
Subject: [PATCH] Improve main workflow

---
 .github/PULL_REQUEST_TEMPLATE.md |  2 +-
 .github/workflows/main.yml       | 27 +++++++++++++++++++++------
 before-push.sh                   |  4 ++++
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 905e0064..c4810500 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -43,4 +43,4 @@ Closes #IssueNumber
 - [ ] I have run `dart format .`` on the project <!-- REQUIRED -->
 - [ ] I have run `dart fix --apply` on the project <!-- REQUIRED -->
 - [ ] I have run `flutter test` and `flutter analyze` and it passed successfully <!-- REQUIRED -->
-- [ ] I have run `./before-push.sh` and everything is fine <!-- Optional >
+- [ ] I have run `./before-push.sh` and everything is fine <!-- Optional -->
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c9262307..c5314cc0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,9 +15,24 @@ jobs:
       - uses: subosito/flutter-action@v2
         with:
           channel: 'stable'
-      - run: flutter --version
-      - run: flutter pub get
-      - run: flutter pub get -C flutter_quill_extensions
-      - run: flutter analyze
-      - run: flutter test
-      - run: flutter pub publish --dry-run
+
+      - name: Check flutter version
+        run: flutter --version
+
+      - name: Install dependencies
+        run: flutter pub get
+      
+      - name: Install flutter_quill_extensions dependencies
+        run: flutter pub get -C flutter_quill_extensions
+
+      - name: Run flutter analysis
+        run: flutter analyze
+
+      - name: Check dart code formatting
+        run: dart format --set-exit-if-changed .
+
+      - name: Check if package is ready for publishing
+        run: flutter pub publish --dry-run
+
+      - name: Run flutter tests
+        run: flutter test
diff --git a/before-push.sh b/before-push.sh
index 3f836d4a..3c163f6a 100755
--- a/before-push.sh
+++ b/before-push.sh
@@ -20,4 +20,8 @@ dart fix --apply
 echo "Running 'dart format .'"
 dart format .
 
+# Check dart code formatting
+echo "Running `dart format --set-exit-if-changed .`"
+dart format --set-exit-if-changed .
+
 echo "Script completed."