enhancements

WalletConnect · Jul 16, 2024 · 556b73c · 556b73c
1 parent 018f47f
commit 556b73c
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 69 deletions.
diff --git a/.github/actions/ci/action.yml b/.github/actions/ci/action.yml
@@ -1,5 +1,6 @@
 name: ci
 description: Executes Dart specific CI steps.
+
 inputs:
   type:
     description: The type of CI to run.

diff --git a/.github/actions/dependencies/action.yml b/.github/actions/dependencies/action.yml
@@ -4,18 +4,35 @@ description: Installs dependencies
 runs:
   using: composite
   steps:
-    # General Tests
-    - name: Install packages
+    # Install Flutter SDK
+    - name: Install Flutter
+      uses: subosito/flutter-action@v2
+      with:
+        channel: "stable"
+        architecture: x64
+
+    # Get package dependencies and generate files
+    - name: Get package dependencies and generate files
       shell: bash
-      run: flutter pub get
+      run: |
+        flutter pub get
+        flutter pub run build_runner build --delete-conflicting-outputs
 
-    # - name: Generate code
-    #   shell: bash
-    #   run: flutter pub run build_runner build --delete-conflicting-outputs
+    # Get example app dependencies and generate files
+    - name: Get example app dependencies and generate files
+      shell: bash
+      working-directory: example/wallet
+      run: |
+        flutter pub get
+        flutter pub run build_runner build --delete-conflicting-outputs
 
-    - name: Install packages for example
+    # Get example app dependencies and generate files
+    - name: Get example app dependencies and generate files
       shell: bash
-      run: cd example/dapp && flutter pub get && cd ../..
+      working-directory: example/dapp
+      run: |
+        flutter pub get
+        flutter pub run build_runner build --delete-conflicting-outputs
 
     - name: Verify formatting and analyze project source
       shell: bash

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -10,30 +10,26 @@ jobs:
     name: Publish to pub.dev
     permissions:
       id-token: write
-    runs-on: ubuntu-latest
+    runs-on: macos-latest-xlarge
     steps:
       # Checkout the repo
       - uses: actions/checkout@v3
-
-      # Install Flutter
-      - name: Install and set Flutter version
-        uses: subosito/flutter-action@v2
-        with:
-          flutter-version: '3.19.5'
 
+      # Install Flutter and Dependencies
+      - uses: ./.github/actions/dependencies
+
       # Setup Dart SDK
       - uses: dart-lang/setup-dart@v1
 
-      # Setup Dependencies
-      - uses: ./.github/actions/dependencies
-
       # Publish
       - name: Check Publish Warnings
         shell: bash
         run: flutter pub publish --dry-run
+
       - name: Publish Package
         shell: bash
         run: flutter pub publish -f
+
       # Notify
       - name: Notify Channel
         uses: slackapi/[email protected]
@@ -44,4 +40,7 @@ jobs:
           payload: |-
             {
               "text":"🚀 WalletConnectFlutterV2 *${{ github.ref_name }}* was just published at https://pub.dev/packages/walletconnect_flutter_v2"
-            }
+            }
+
+# Launch locally
+# act -j publish --container-architecture linux/amd64 -P macos-latest-xlarge=-self-hosted --secret-file .github/workflows/.env.secret -W .github/workflows/publish.yml
diff --git a/.github/workflows/release_dapp_ios.yml b/.github/workflows/release_dapp_ios.yml
@@ -42,25 +42,8 @@ jobs:
     # - name: Install Fastlane
     #   run: gem install fastlane
 
-    # Install Flutter SDK
-    - name: Install Flutter
-      uses: subosito/flutter-action@v2
-      with:
-        channel: "stable"
-        architecture: x64
-
-    # Get package dependencies and generate files
-    - name: Get package dependencies and generate files
-      run: |
-        flutter pub get
-        flutter pub run build_runner build --delete-conflicting-outputs
-
-    # Get example app dependencies and generate files
-    - name: Get example app dependencies and generate files
-      working-directory: example/dapp
-      run: |
-        flutter pub get
-        flutter pub run build_runner build --delete-conflicting-outputs
+    # Install Flutter and Dependencies
+    - uses: ./.github/actions/dependencies
 
     # Build App
     - name: Build App

diff --git a/.github/workflows/release_wallet_ios.yml b/.github/workflows/release_wallet_ios.yml
@@ -19,17 +19,17 @@ jobs:
     #   with:
     #     bundler-cache: true
 
-    # # Cache
-    # - name: Cache
-    #   uses: actions/cache@v3
-    #   with:
-    #     path: |
-    #       .build
-    #       SourcePackagesCache
-    #       DerivedDataCache
-    #     key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-    #     restore-keys: |
-    #       ${{ runner.os }}-spm-
+    # Cache
+    - name: Cache
+      uses: actions/cache@v3
+      with:
+        path: |
+          .build
+          SourcePackagesCache
+          DerivedDataCache
+        key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
+        restore-keys: |
+          ${{ runner.os }}-spm-
 
     # # Install Ruby
     # - name: Install Ruby
@@ -40,27 +40,10 @@ jobs:
 
     # # Install Fastlane
     # - name: Install Fastlane
-    #   run: gem install fastlane
-
-    # Install Flutter SDK
-    - name: Install Flutter
-      uses: subosito/flutter-action@v2
-      with:
-        channel: "stable"
-        architecture: x64
+    #   run: gem install fastlane 
 
-    # Get package dependencies and generate files
-    - name: Get package dependencies and generate files
-      run: |
-        flutter pub get
-        flutter pub run build_runner build --delete-conflicting-outputs
-
-    # Get example app dependencies and generate files
-    - name: Get example app dependencies and generate files
-      working-directory: example/wallet
-      run: |
-        flutter pub get
-        flutter pub run build_runner build --delete-conflicting-outputs
+    # Install Flutter and Dependencies
+    - uses: ./.github/actions/dependencies
 
     # Build App
     - name: Build App