diff --git a/.github/workflows/emerge.yml b/.github/workflows/emerge.yml index af398adc1..d79bb3583 100644 --- a/.github/workflows/emerge.yml +++ b/.github/workflows/emerge.yml @@ -1,46 +1,46 @@ -name: Size Check +# name: Size Check -on: - pull_request: - branches: - - '**' - paths-ignore: - - 'docusaurus/**' - - 'README.md' - - 'CHANGELOG.md' +# on: +# pull_request: +# branches: +# - '**' +# paths-ignore: +# - 'docusaurus/**' +# - 'README.md' +# - 'CHANGELOG.md' - workflow_dispatch: +# workflow_dispatch: -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true +# 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 +# env: +# HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI -jobs: - upload--build: - name: Upload Build to Emerge - runs-on: macos-13 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_PR_NUM: ${{ github.event.number }} - GITHUB_COMMIT_SHA: ${{ github.event.pull_request.head.sha }} - GITHUB_BASE_SHA: ${{ github.event.pull_request.base.sha }} - EMERGE_API_TOKEN: ${{ secrets.EMERGE_API_TOKEN }} - steps: - - name: Install Bot SSH Key - uses: webfactory/ssh-agent@v0.7.0 - with: - ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }} - - uses: actions/checkout@v3.1.0 - - uses: ./.github/actions/ruby-cache - - name: Run match_me - env: - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }} - run: bundle exec fastlane match_me - - name: Emerge SwiftUI Demo App - run: bundle exec fastlane emerge_swiftui - - name: Emerge UIKit Demo App - run: bundle exec fastlane emerge_uikit +# jobs: +# upload--build: +# name: Upload Build to Emerge +# runs-on: macos-13 +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# GITHUB_PR_NUM: ${{ github.event.number }} +# GITHUB_COMMIT_SHA: ${{ github.event.pull_request.head.sha }} +# GITHUB_BASE_SHA: ${{ github.event.pull_request.base.sha }} +# EMERGE_API_TOKEN: ${{ secrets.EMERGE_API_TOKEN }} +# steps: +# - name: Install Bot SSH Key +# uses: webfactory/ssh-agent@v0.7.0 +# with: +# ssh-private-key: ${{ secrets.BOT_SSH_PRIVATE_KEY }} +# - uses: actions/checkout@v3.1.0 +# - uses: ./.github/actions/ruby-cache +# - name: Run match_me +# env: +# MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} +# APPSTORE_API_KEY: ${{ secrets.APPSTORE_API_KEY }} +# run: bundle exec fastlane match_me +# - name: Emerge SwiftUI Demo App +# run: bundle exec fastlane emerge_swiftui +# - name: Emerge UIKit Demo App +# run: bundle exec fastlane emerge_uikit diff --git a/.github/workflows/smoke-checks.yml b/.github/workflows/smoke-checks.yml index 915f16b22..a8c565ca7 100644 --- a/.github/workflows/smoke-checks.yml +++ b/.github/workflows/smoke-checks.yml @@ -64,74 +64,74 @@ jobs: derived_data/Build/**/*.xctestrun derived_data/Build/**/*.framework - test-llc-debug: - name: Test LLC (Debug) - runs-on: macos-13 - needs: build-test-app-and-frameworks - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_PR_NUM: ${{ github.event.number }} - STREAM_VIDEO_SECRET: ${{ secrets.STREAM_VIDEO_SECRET }} - # IOS_SIMULATOR_DEVICE: "iPhone 14 Pro (16.4)" # TODO: delete this line as soon as Xcode 15 is stable on CI - # XCODE_VERSION: "14.3.1" # TODO: delete this line as soon as Xcode 15 is stable on CI - steps: - - uses: actions/checkout@v3.1.0 - with: - fetch-depth: 100 - - uses: actions/download-artifact@v3 - with: - name: cache-derived-data - path: derived_data/Build/ - - uses: ./.github/actions/bootstrap - - uses: ./.github/actions/python-cache - - name: Run LLC Tests (Debug) - run: bundle exec fastlane test device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true - timeout-minutes: 40 - - name: Get branch name - id: get_branch_name - run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT - - name: Run Sonar analysis - run: bundle exec fastlane sonar_upload - env: - BRANCH_NAME: ${{ steps.get_branch_name.outputs.branch }} - 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 LLC (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() }} + # test-llc-debug: + # name: Test LLC (Debug) + # runs-on: macos-13 + # needs: build-test-app-and-frameworks + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # GITHUB_PR_NUM: ${{ github.event.number }} + # STREAM_VIDEO_SECRET: ${{ secrets.STREAM_VIDEO_SECRET }} + # # IOS_SIMULATOR_DEVICE: "iPhone 14 Pro (16.4)" # TODO: delete this line as soon as Xcode 15 is stable on CI + # # XCODE_VERSION: "14.3.1" # TODO: delete this line as soon as Xcode 15 is stable on CI + # steps: + # - uses: actions/checkout@v3.1.0 + # with: + # fetch-depth: 100 + # - uses: actions/download-artifact@v3 + # with: + # name: cache-derived-data + # path: derived_data/Build/ + # - uses: ./.github/actions/bootstrap + # - uses: ./.github/actions/python-cache + # - name: Run LLC Tests (Debug) + # run: bundle exec fastlane test device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true + # timeout-minutes: 40 + # - name: Get branch name + # id: get_branch_name + # run: echo "branch=${GITHUB_REF#refs/heads/}" >> $GITHUB_OUTPUT + # - name: Run Sonar analysis + # run: bundle exec fastlane sonar_upload + # env: + # BRANCH_NAME: ${{ steps.get_branch_name.outputs.branch }} + # 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 LLC (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() }} - test-swiftui-debug: - name: Test SwiftUI (Debug) - runs-on: macos-13 - needs: build-test-app-and-frameworks - if: ${{ github.event_name != 'push' }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_PR_NUM: ${{ github.event.number }} - steps: - - uses: actions/checkout@v3.1.0 - - uses: ./.github/actions/bootstrap - - name: Run UI Tests (Debug) - run: bundle exec fastlane test_swiftui device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true - timeout-minutes: 40 - - name: Parse xcresult - if: failure() - run: | - brew install chargepoint/xcparse/xcparse - xcparse screenshots fastlane/test_output/StreamChatUI.xcresult fastlane/test_output/snapshots --test - - uses: actions/upload-artifact@v3 - if: failure() - with: - name: Test Data - path: | - fastlane/test_output/snapshots + # test-swiftui-debug: + # name: Test SwiftUI (Debug) + # runs-on: macos-13 + # needs: build-test-app-and-frameworks + # if: ${{ github.event_name != 'push' }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # GITHUB_PR_NUM: ${{ github.event.number }} + # steps: + # - uses: actions/checkout@v3.1.0 + # - uses: ./.github/actions/bootstrap + # - name: Run UI Tests (Debug) + # run: bundle exec fastlane test_swiftui device:"${{ env.IOS_SIMULATOR_DEVICE }}" skip_build:true + # timeout-minutes: 40 + # - name: Parse xcresult + # if: failure() + # run: | + # brew install chargepoint/xcparse/xcparse + # xcparse screenshots fastlane/test_output/StreamChatUI.xcresult fastlane/test_output/snapshots --test + # - uses: actions/upload-artifact@v3 + # if: failure() + # with: + # name: Test Data + # path: | + # fastlane/test_output/snapshots # test-uikit-debug: # name: Test UIKit (Debug) @@ -158,26 +158,26 @@ jobs: # path: | # fastlane/test_output/snapshots - build-apps: - name: Build Demo Apps - runs-on: macos-13 - needs: build-test-app-and-frameworks - if: ${{ github.event_name != 'push' }} - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_PR_NUM: ${{ github.event.number }} - steps: - - uses: actions/checkout@v3.1.0 - - uses: actions/download-artifact@v3 - with: - name: cache-derived-data - path: derived_data/Build/ - - uses: ./.github/actions/ruby-cache - - uses: ./.github/actions/xcode-cache - - name: Build SwiftUI Demo App - run: bundle exec fastlane build_swiftui_demo - - name: Build UIKit Demo App - run: bundle exec fastlane build_uikit_demo + # build-apps: + # name: Build Demo Apps + # runs-on: macos-13 + # needs: build-test-app-and-frameworks + # if: ${{ github.event_name != 'push' }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # GITHUB_PR_NUM: ${{ github.event.number }} + # steps: + # - uses: actions/checkout@v3.1.0 + # - uses: actions/download-artifact@v3 + # with: + # name: cache-derived-data + # path: derived_data/Build/ + # - uses: ./.github/actions/ruby-cache + # - uses: ./.github/actions/xcode-cache + # - name: Build SwiftUI Demo App + # run: bundle exec fastlane build_swiftui_demo + # - name: Build UIKit Demo App + # run: bundle exec fastlane build_uikit_demo # test-e2e-debug: # name: Test E2E UI (Debug) diff --git a/Gemfile.lock b/Gemfile.lock index 87ae05cfb..c4f0f81e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,16 +17,16 @@ GEM ast (2.4.2) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.823.0) - aws-sdk-core (3.181.1) + aws-partitions (1.830.0) + aws-sdk-core (3.184.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.651.0) aws-sigv4 (~> 1.5) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.71.0) - aws-sdk-core (~> 3, >= 3.177.0) + aws-sdk-kms (1.72.0) + aws-sdk-core (~> 3, >= 3.184.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.134.0) + aws-sdk-s3 (1.136.0) aws-sdk-core (~> 3, >= 3.181.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.6) @@ -39,10 +39,10 @@ GEM nap open4 (~> 1.3) clamp (1.3.2) - cocoapods (1.12.1) + cocoapods (1.13.0) addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.12.1) + cocoapods-core (= 1.13.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.6.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -56,8 +56,8 @@ GEM molinillo (~> 0.8.0) nap (~> 1.0) ruby-macho (>= 2.3.0, < 3.0) - xcodeproj (>= 1.21.0, < 2.0) - cocoapods-core (1.12.1) + xcodeproj (>= 1.23.0, < 2.0) + cocoapods-core (1.13.0) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -84,7 +84,7 @@ GEM concurrent-ruby (1.2.2) cork (0.3.0) colored2 (~> 3.1) - danger (9.3.1) + danger (9.3.2) claide (~> 1.0) claide-plugins (>= 0.9.2) colored2 (~> 3.1) @@ -143,7 +143,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.7) - fastlane (2.214.0) + fastlane (2.216.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -164,6 +164,7 @@ GEM google-apis-playcustomapp_v1 (~> 0.1) google-cloud-storage (~> 1.31) highline (~> 2.0) + http-cookie (~> 1.0.5) json (< 3.0.0) jwt (>= 2.1.0, < 3) mini_magick (>= 4.9.4, < 5.0.0) @@ -175,14 +176,14 @@ GEM security (= 0.1.3) simctl (~> 1.6.3) terminal-notifier (>= 2.0.0, < 3.0.0) - terminal-table (>= 1.4.5, < 2.0.0) + terminal-table (~> 3) tty-screen (>= 0.6.3, < 1.0.0) tty-spinner (>= 0.8.0, < 1.0.0) word_wrap (~> 1.0.0) xcodeproj (>= 1.13.0, < 2.0.0) xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) - fastlane-plugin-emerge (0.5.1) + fastlane-plugin-emerge (0.6.0) faraday (~> 1.1) fastlane-plugin-lizard (1.3.3) bundler @@ -191,14 +192,14 @@ GEM fastlane-plugin-stream_actions (0.3.20) xctest_list (= 1.2.1) fastlane-plugin-versioning (0.5.2) - ffi (1.15.5) + ffi (1.16.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) git (1.18.0) addressable (~> 2.8) rchardet (~> 1.8) - google-apis-androidpublisher_v3 (0.49.0) + google-apis-androidpublisher_v3 (0.50.0) google-apis-core (>= 0.11.0, < 2.a) google-apis-core (0.11.1) addressable (~> 2.5, >= 2.5.1) @@ -229,7 +230,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.8.0) + googleauth (1.8.1) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) multi_json (~> 1.11) @@ -241,13 +242,13 @@ GEM httpclient (2.8.3) i18n (1.14.1) concurrent-ruby (~> 1.0) - jazzy (0.14.3) + jazzy (0.14.4) cocoapods (~> 1.5) mustache (~> 1.1) open4 (~> 1.3) redcarpet (~> 3.4) rexml (~> 3.2) - rouge (>= 2.0.6, < 4.0) + rouge (>= 2.0.6, < 5.0) sassc (~> 2.1) sqlite3 (~> 1.3) xcinvoke (~> 0.3.0) @@ -321,7 +322,7 @@ GEM unicode-display_width (>= 1.4.0, < 3.0) rubocop-ast (1.29.0) parser (>= 3.2.1.0) - rubocop-performance (1.19.0) + rubocop-performance (1.19.1) rubocop (>= 1.7.0, < 2.0) rubocop-ast (>= 0.4.0) rubocop-require_tools (0.1.2) @@ -358,8 +359,8 @@ GEM sqlite3 (1.6.6) mini_portile2 (~> 2.8.0) terminal-notifier (2.0.0) - terminal-table (1.8.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) tilt (2.3.0) trailblazer-option (0.1.2) tty-cursor (0.7.1) @@ -374,7 +375,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8.2) - unicode-display_width (1.8.0) + unicode-display_width (2.4.2) webrick (1.8.1) word_wrap (1.0.0) xcinvoke (0.3.0) @@ -382,7 +383,7 @@ GEM xcode-install (2.8.1) claide (>= 0.9.1) fastlane (>= 2.1.0, < 3.0.0) - xcodeproj (1.22.0) + xcodeproj (1.23.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 3ef1f63d2..3b40449ab 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -120,6 +120,7 @@ lane :create_credentials_config do end lane :build_test_app_and_frameworks do + match_me scan( project: xcode_project, scheme: 'DemoApp',