Merge branch 'develop' into demo-app/default-sorting-key

GetStream · Jan 31, 2025 · fe49123 · fe49123
2 parents c17567a + b8045ad
commit fe49123
Show file tree

Hide file tree

Showing 10 changed files with 108 additions and 186 deletions.
diff --git a/.github/actions/bootstrap/action.yml b/.github/actions/bootstrap/action.yml
@@ -14,17 +14,6 @@ runs:
         path: ~/.mint
         key: ${{ env.IMAGE }}-mint-${{ hashFiles('**/Mintfile') }}
         restore-keys: ${{ env.IMAGE }}-mint-
-    - name: Cache brew
-      uses: actions/cache@v4
-      id: brew-cache
-      with:
-        path: |
-          ~/Library/Caches/Homebrew/mint*
-          ~/Library/Caches/Homebrew/vale*
-          ~/Library/Caches/Homebrew/xcparse*
-          ~/Library/Caches/Homebrew/sonar-scanner*
-        key: ${{ env.IMAGE }}-brew-${{ hashFiles('**/Brewfile.lock.json') }}
-        restore-keys: ${{ env.IMAGE }}-brew-
     - uses: ./.github/actions/ruby-cache
     - uses: ./.github/actions/xcode-cache
     - run: ./Scripts/bootstrap.sh

diff --git a/.github/workflows/cron-checks.yml b/.github/workflows/cron-checks.yml
@@ -73,7 +73,6 @@ jobs:
         INSTALL_ALLURE: true
         INSTALL_YEETD: true
         SKIP_MINT_BOOTSTRAP: true
-        SKIP_BREW_BOOTSTRAP: true
     - uses: ./.github/actions/setup-ios-runtime
       if: ${{ matrix.setup_runtime }}
       timeout-minutes: 60

diff --git a/.github/workflows/smoke-checks-swiftui.yml b/.github/workflows/smoke-checks-swiftui.yml
@@ -0,0 +1,79 @@
+name: Smoke Checks SwiftUI
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+
+  pull_request:
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
+
+  workflow_dispatch:
+    inputs:
+      snapshots:
+        description: 'Should Snapshots be recorded on CI?'
+        type: boolean
+        required: false
+        default: false
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+env:
+  HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
+  IOS_SIMULATOR_DEVICE: "iPhone 16 Pro (18.1)"
+  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GITHUB_PR_NUM: ${{ github.event.pull_request.number }}
+
+jobs:
+  test-ui-debug:
+    name: Test SwiftUI (Debug)
+    runs-on: macos-15
+    steps:
+    - uses: actions/[email protected]
+    - uses: ./.github/actions/bootstrap
+      env:
+        INSTALL_YEETD: true
+        INSTALL_SONAR: true
+    - uses: ./.github/actions/python-cache
+    - name: Run UI Tests (Debug)
+      run: bundle exec fastlane test_ui device:"${{ env.IOS_SIMULATOR_DEVICE }}" record:${{ github.event.inputs.snapshots }}
+      timeout-minutes: 120
+      env:
+        GITHUB_TOKEN: ${{ secrets.CI_BOT_GITHUB_TOKEN }} # to open a PR
+    - name: Run Sonar analysis
+      if: ${{ github.event.inputs.snapshots != 'true' }}
+      run: bundle exec fastlane sonar_upload
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+    - uses: 8398a7/action-slack@v3
+      with:
+        status: ${{ job.status }}
+        text: "You shall not pass!"
+        job_name: "Test (Debug)"
+        fields: message,commit,author,action,workflow,job,took
+      env:
+        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+        MATRIX_CONTEXT: ${{ toJson(matrix) }}
+      if: ${{ github.event_name == 'push' && failure() }}
+    - name: Parse xcresult
+      if: failure()
+      run: |
+        brew install chargepoint/xcparse/xcparse
+        xcparse logs fastlane/test_output/StreamChatSwiftUI.xcresult fastlane/test_output/logs/
+        xcparse screenshots fastlane/test_output/StreamChatSwiftUI.xcresult fastlane/test_output/snapshots --test
+    - uses: actions/upload-artifact@v4
+      if: failure()
+      with:
+        name: Test Data UI
+        path: |
+          fastlane/recordings
+          fastlane/sinatra_log.txt
+          fastlane/test_output/snapshots
+          fastlane/test_output/logs/*/Diagnostics/**/*.txt
+          fastlane/test_output/logs/*/Diagnostics/simctl_diagnostics/DiagnosticReports/*
diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml
@@ -2,16 +2,11 @@ name: Smoke Checks
 
 on:
   pull_request:
-    branches:
-      - '**'
+    paths-ignore:
+      - 'README.md'
+      - 'CHANGELOG.md'
 
   workflow_dispatch:
-    inputs:
-      snapshots:
-        description: 'Should Snapshots be recorded on CI?'
-        type: boolean
-        required: false
-        default: false
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -27,7 +22,6 @@ jobs:
   build-test-app-and-frameworks:
     name: Build Test App and Frameworks
     runs-on: macos-15
-    if: ${{ github.event_name != 'push' }}
     steps:
     - uses: actions/[email protected]
     - uses: ./.github/actions/ruby-cache
@@ -49,7 +43,6 @@ jobs:
     runs-on: macos-15
     env:
       XCODE_VERSION: "15.4"
-    if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     steps:
     - uses: actions/[email protected]
     - uses: ./.github/actions/bootstrap
@@ -66,7 +59,6 @@ jobs:
   build-xcode15:
     name: Build SDKs (Xcode 15.0)
     runs-on: macos-15
-    if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     env:
       XCODE_VERSION: "15.4"
     steps:
@@ -89,62 +81,9 @@ jobs:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
         APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }}
 
-  test-ui-debug:
-    name: Test SwiftUI (Debug)
-    runs-on: macos-15
-    needs: build-test-app-and-frameworks
-    steps:
-    - uses: actions/[email protected]
-    - uses: actions/download-artifact@v4
-      with:
-        name: cache-derived-data
-        path: derived_data/Build/
-    - uses: ./.github/actions/bootstrap
-      env:
-        INSTALL_YEETD: true
-    - uses: ./.github/actions/python-cache
-    - name: Run UI Tests (Debug)
-      run: bundle exec fastlane test_ui device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true record:${{ github.event.inputs.snapshots }}
-      timeout-minutes: 120
-      env:
-        GITHUB_TOKEN: ${{ secrets.CI_BOT_GITHUB_TOKEN }} # to open a PR
-    - name: Run Sonar analysis
-      if: ${{ github.event.inputs.snapshots != 'true' }}
-      run: bundle exec fastlane sonar_upload
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-        SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-    - uses: 8398a7/action-slack@v3
-      with:
-        status: ${{ job.status }}
-        text: "You shall not pass!"
-        job_name: "Test (Debug)"
-        fields: message,commit,author,action,workflow,job,took
-      env:
-        SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-        MATRIX_CONTEXT: ${{ toJson(matrix) }}
-      if: ${{ github.event_name == 'push' && failure() }}
-    - name: Parse xcresult
-      if: failure()
-      run: |
-        brew install chargepoint/xcparse/xcparse
-        xcparse logs fastlane/test_output/StreamChatSwiftUI.xcresult fastlane/test_output/logs/
-        xcparse screenshots fastlane/test_output/StreamChatSwiftUI.xcresult fastlane/test_output/snapshots --test
-    - uses: actions/upload-artifact@v4
-      if: failure()
-      with:
-        name: Test Data UI
-        path: |
-          fastlane/recordings
-          fastlane/sinatra_log.txt
-          fastlane/test_output/snapshots
-          fastlane/test_output/logs/*/Diagnostics/**/*.txt
-          fastlane/test_output/logs/*/Diagnostics/simctl_diagnostics/DiagnosticReports/*
-
   allure_testops_launch:
     name: Launch Allure TestOps
     runs-on: macos-13
-    if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     needs: build-test-app-and-frameworks
     outputs:
       launch_id: ${{ steps.get_launch_id.outputs.launch_id }}
@@ -163,7 +102,6 @@ jobs:
   test-e2e-debug:
     name: Test E2E UI (Debug)
     runs-on: macos-15
-    if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     needs:
       - allure_testops_launch
       - build-test-app-and-frameworks
@@ -184,7 +122,6 @@ jobs:
         INSTALL_ALLURE: true
         INSTALL_YEETD: true
         SKIP_MINT_BOOTSTRAP: true
-        SKIP_BREW_BOOTSTRAP: true
     - name: Run UI Tests (Debug)
       run: bundle exec fastlane test_e2e_mock device:"${{ env.IOS_SIMULATOR_DEVICE }}" batch:'${{ matrix.batch }}' test_without_building:true
       timeout-minutes: 100
@@ -220,7 +157,6 @@ jobs:
     name: Build Demo App
     runs-on: macos-14
     needs: build-test-app-and-frameworks
-    if: ${{ github.event_name != 'push' && github.event.inputs.snapshots != 'true' }}
     steps:
     - uses: actions/[email protected]
     - uses: actions/download-artifact@v4

diff --git a/.gitignore b/.gitignore
@@ -71,6 +71,8 @@ fastlane/screenshots
 fastlane/test_output
 fastlane/allurectl
 fastlane/xcresults
+fastlane/sonar
+fastlane/mint
 **/metrics/
 fastlane/recordings
 StreamChatCore.framework.coverage.txt

diff --git a/Brewfile b/Brewfile
diff --git a/Brewfile.lock.json b/Brewfile.lock.json
diff --git a/Githubfile b/Githubfile
@@ -3,3 +3,5 @@
 export ALLURECTL_VERSION='2.15.1'
 export XCRESULTS_VERSION='1.16.3'
 export YEETD_VERSION='1.0'
+export MINT_VERSION='0.17.5'
+export SONAR_VERSION='6.2.1.4610'