Merge GH and Pub Release Jobs

Author: TheBuggedYRN

.circleci/config.yml

@@ -118,25 +118,31 @@ jobs:
           command: flutter pub run pana --no-warning --exit-code-threshold 0
       - run: flutter pub publish --dry-run
 
-  pub_release:
-    docker:
-      - image: cirrusci/flutter
-    steps:
-      - checkout
-      - run: chmod +x ./release.sh
-      - run: ./release.sh
-
-  gh_ibg_release:
+  release:
     macos:
-      xcode: "13.4.1"
-    working_directory: "~"
+      xcode: 13.4.1
+    working_directory: ~
     steps:
-      - checkout:
-          path: ~/project
-      - run: git clone https://InstabugCI:[email protected]/Instabug/Escape.git
-      - run: cd Escape && swift build -c release
-      - run: cd Escape/.build/release && cp -f Escape /usr/local/bin/escape
-      - run: cd project && Escape flutter publish
+      - checkout
+      - flutter/install_sdk_and_pub:
+          flutter_version: 3.3.6
+          app-dir: project
+      - run:
+          name: Generate Pigeons
+          command: sh ./scripts/pigeon.sh
+      - run:
+          name: Clone Escape
+          command: git clone [email protected]:Instabug/Escape.git
+      - run:
+          name: Build Escape
+          working_directory: Escape
+          command: |
+            swift build -c release
+            cp -f .build/release/Escape /usr/local/bin/escape
+      - run:
+          name: Publish Package
+          working_directory: project
+          command: Escape flutter publish
 
 workflows:
   version: 2
@@ -153,24 +159,7 @@ workflows:
       - verify_pub:
           requires:
             - lint_flutter
-      - hold_pub_release:
-          type: approval
-          requires:
-            - flutter_tests
-            - flutter_tests_2-10-5
-            - test_android
-            - ios_tests
-            - verify_pub
-          filters:
-            branches:
-              only: master
-      - pub_release:
-          requires:
-            - hold_pub_release
-          filters:
-            branches:
-              only: master
-      - hold_gh_ibg_release:
+      - hold_release:
           type: approval
           requires:
             - flutter_tests
@@ -181,9 +170,9 @@ workflows:
           filters:
             branches:
               only: master
-      - gh_ibg_release:
+      - release:
           requires:
-            - hold_gh_ibg_release
+            - hold_release
           filters:
             branches:
               only: master