Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Fix handling manual code in CHIPTool #29255

Merged
merged 5 commits into from
Sep 22, 2023

Re-run kotlin formatter via scriptsd/helpers/kotlin-format.sh

c7c2ed2
Select commit
Loading
Failed to load commit list.
Merged

[Android] Fix handling manual code in CHIPTool #29255

Re-run kotlin formatter via scriptsd/helpers/kotlin-format.sh
c7c2ed2
Select commit
Loading
Failed to load commit list.
Mergify / Summary succeeded Sep 22, 2023 in 3s

1 rule matches

⚠️ The pull request has been merged by @andy31415

Rule: Automatic merge on PullApprove (merge)

  • #approved-reviews-by>=1
  • #check-failure=0
  • #check-pending=0
  • #review-threads-unresolved=0
  • #review-threads-unresolved=0 [🛡 GitHub branch protection]
  • -draft
  • -draft [:pushpin: merge requirement]
  • -mergify-configuration-changed [:pushpin: merge -> allow_merging_configuration_change setting requirement]
  • check-success~=Build
  • label!=docker
  • any of:
    • check-success=pullapprove
    • label="fast track"
  • any of:
    • check-success=pullapprove
    • check-neutral=pullapprove
    • check-skipped=pullapprove
  • any of: [🛡 GitHub branch protection]
    • check-success=pullapprove
    • check-neutral=pullapprove
    • check-skipped=pullapprove
  • any of: [🛡 GitHub branch protection]
    • check-success=license/cla
    • check-neutral=license/cla
    • check-skipped=license/cla
  • any of: [🛡 GitHub branch protection]
    • check-success=ESP32
    • check-neutral=ESP32
    • check-skipped=ESP32
  • any of: [🛡 GitHub branch protection]
    • check-success=EFR32
    • check-neutral=EFR32
    • check-skipped=EFR32
  • any of: [🛡 GitHub branch protection]
    • check-success=Build Darwin
    • check-neutral=Build Darwin
    • check-skipped=Build Darwin
  • any of: [🛡 GitHub branch protection]
    • check-success=Infineon examples building
    • check-neutral=Infineon examples building
    • check-skipped=Infineon examples building
  • any of: [🛡 GitHub branch protection]
    • check-success=Linux Standalone
    • check-neutral=Linux Standalone
    • check-skipped=Linux Standalone
  • any of: [🛡 GitHub branch protection]
    • check-success=Build on Darwin (clang, python_lib, simulated)
    • check-neutral=Build on Darwin (clang, python_lib, simulated)
    • check-skipped=Build on Darwin (clang, python_lib, simulated)
  • any of: [🛡 GitHub branch protection]
    • check-success=K32W
    • check-neutral=K32W
    • check-skipped=K32W
  • any of: [🛡 GitHub branch protection]
    • check-success=QPG
    • check-neutral=QPG
    • check-skipped=QPG
  • any of: [🛡 GitHub branch protection]
    • check-success=Ameba
    • check-neutral=Ameba
    • check-skipped=Ameba
  • any of: [🛡 GitHub branch protection]
    • check-success=Telink
    • check-neutral=Telink
    • check-skipped=Telink
  • any of: [🛡 GitHub branch protection]
    • check-success=Tizen
    • check-neutral=Tizen
    • check-skipped=Tizen
  • any of: [🛡 GitHub branch protection]
    • check-success=Smoke Run - Android
    • check-neutral=Smoke Run - Android
    • check-skipped=Smoke Run - Android
  • any of: [🛡 GitHub branch protection]
    • check-success=Test Suites - Linux (no-ble-tsan-clang)
    • check-neutral=Test Suites - Linux (no-ble-tsan-clang)
    • check-skipped=Test Suites - Linux (no-ble-tsan-clang)
  • any of: [🛡 GitHub branch protection]
    • check-success=ZAP templates generation
    • check-neutral=ZAP templates generation
    • check-skipped=ZAP templates generation
  • any of: [🛡 GitHub branch protection]
    • check-success=code-lints
    • check-neutral=code-lints
    • check-skipped=code-lints
  • any of: [🛡 GitHub branch protection]
    • check-success=Build on Linux (fake, gcc_release, clang, simulated)
    • check-neutral=Build on Linux (fake, gcc_release, clang, simulated)
    • check-skipped=Build on Linux (fake, gcc_release, clang, simulated)
  • any of: [🛡 GitHub branch protection]
    • check-success=Build on Linux (gcc_debug)
    • check-neutral=Build on Linux (gcc_debug)
    • check-skipped=Build on Linux (gcc_debug)
  • any of: [🛡 GitHub branch protection]
    • check-success=Build on Linux (python_lib)
    • check-neutral=Build on Linux (python_lib)
    • check-skipped=Build on Linux (python_lib)
  • any of: [🛡 GitHub branch protection]
    • check-success=triage
    • check-neutral=triage
    • check-skipped=triage
  • any of: [🛡 GitHub branch protection]
    • check-success=Chef - ESP32 CI Examples
    • check-neutral=Chef - ESP32 CI Examples
    • check-skipped=Chef - ESP32 CI Examples
  • any of: [🛡 GitHub branch protection]
    • check-success=Chef - Linux CI Examples
    • check-neutral=Chef - Linux CI Examples
    • check-skipped=Chef - Linux CI Examples
  • any of: [🛡 GitHub branch protection]
    • check-success=restyled
    • check-neutral=restyled
    • check-skipped=restyled
  • any of: [🛡 GitHub branch protection]
    • check-success=Unit / Integration Tests (clang)
    • check-neutral=Unit / Integration Tests (clang)
    • check-skipped=Unit / Integration Tests (clang)
  • any of: [🛡 GitHub branch protection]
    • check-success=Unit / Integration Tests (main)
    • check-neutral=Unit / Integration Tests (main)
    • check-skipped=Unit / Integration Tests (main)
  • any of: [🛡 GitHub branch protection]
    • check-success=Unit / Integration Tests (mbedtls)
    • check-neutral=Unit / Integration Tests (mbedtls)
    • check-skipped=Unit / Integration Tests (mbedtls)
  • any of: [🛡 GitHub branch protection]
    • check-success=ASR
    • check-neutral=ASR
    • check-skipped=ASR
  • any of: [🛡 GitHub branch protection]
    • check-success=Bouffalo Lab
    • check-neutral=Bouffalo Lab
    • check-skipped=Bouffalo Lab
  • any of: [🛡 GitHub branch protection]
    • check-success=ESP32_1
    • check-neutral=ESP32_1
    • check-skipped=ESP32_1
  • any of: [🛡 GitHub branch protection]
    • check-success=Open IoT SDK examples building
    • check-neutral=Open IoT SDK examples building
    • check-skipped=Open IoT SDK examples building
  • any of: [🛡 GitHub branch protection]
    • check-success=Linux
    • check-neutral=Linux
    • check-skipped=Linux
  • any of: [🛡 GitHub branch protection]
    • check-success=Linux / configure build of all-clusters-app
    • check-neutral=Linux / configure build of all-clusters-app
    • check-skipped=Linux / configure build of all-clusters-app
  • any of: [🛡 GitHub branch protection]
    • check-success=Linux ARM Cross compile
    • check-neutral=Linux ARM Cross compile
    • check-skipped=Linux ARM Cross compile
  • any of: [🛡 GitHub branch protection]
    • check-success=Linux i.MX Build
    • check-neutral=Linux i.MX Build
    • check-skipped=Linux i.MX Build
  • any of: [🛡 GitHub branch protection]
    • check-success=MW320
    • check-neutral=MW320
    • check-skipped=MW320
  • any of: [🛡 GitHub branch protection]
    • check-success=Mbed OS examples building
    • check-neutral=Mbed OS examples building
    • check-skipped=Mbed OS examples building
  • any of: [🛡 GitHub branch protection]
    • check-success=REPL Tests - Linux
    • check-neutral=REPL Tests - Linux
    • check-skipped=REPL Tests - Linux
  • any of: [🛡 GitHub branch protection]
    • check-success=Test Suites - Darwin (no-ble-asan-clang)
    • check-neutral=Test Suites - Darwin (no-ble-asan-clang)
    • check-skipped=Test Suites - Darwin (no-ble-asan-clang)
  • any of: [🛡 GitHub branch protection]
    • check-success=Unit / Integration Tests (rotating_device_id)
    • check-neutral=Unit / Integration Tests (rotating_device_id)
    • check-skipped=Unit / Integration Tests (rotating_device_id)
  • any of: [🛡 GitHub branch protection]
    • check-success=cc32xx
    • check-neutral=cc32xx
    • check-skipped=cc32xx
  • any of: [🛡 GitHub branch protection]
    • check-success=nRF Connect SDK
    • check-neutral=nRF Connect SDK
    • check-skipped=nRF Connect SDK

💖  Mergify is proud to provide this service for free to open source projects.

🚀  You can help us by becoming a sponsor!


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com