From e2af19b7884da383d51ae23ed4f40e120b812da4 Mon Sep 17 00:00:00 2001 From: iphydf Date: Thu, 20 Feb 2025 15:10:18 +0000 Subject: [PATCH] fix: Trust "TokTok" as a branch origin. prUser is actually the owner of the branch, not the committer. --- admin/repos.yaml | 8 ++++---- src/GitHub/Tools/AutoMerge.hs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/repos.yaml b/admin/repos.yaml index eccd6f1..1ebd7e7 100644 --- a/admin/repos.yaml +++ b/admin/repos.yaml @@ -272,10 +272,10 @@ _common: - "common / restyled" - "release / update_release_draft" -btox: +bTox: editRepo: <<: *editRepo - name: btox + name: bTox description: Official TokTok mobile Tox client homepage: https://tox.chat/ topics: toxcore, network, p2p, security, encryption, cryptography, android, ios, web @@ -426,9 +426,9 @@ c-toxcore: - "build-macos" - "checks / check-release" - "ci/circleci: bazel-asan" - - "ci/circleci: bazel-dbg" + - "ci/circleci: bazel-debug" - "ci/circleci: bazel-msan" - - "ci/circleci: bazel-opt" + - "ci/circleci: bazel-release" - "ci/circleci: cimplefmt" - "ci/circleci: clang-analyze" - "ci/circleci: cpplint" diff --git a/src/GitHub/Tools/AutoMerge.hs b/src/GitHub/Tools/AutoMerge.hs index 50b95f8..84c4c03 100644 --- a/src/GitHub/Tools/AutoMerge.hs +++ b/src/GitHub/Tools/AutoMerge.hs @@ -27,12 +27,12 @@ trustedAuthors :: [Text] trustedAuthors = [ "Green-Sky" , "JFreegman" + , "TokTok" , "dependabot[bot]" , "iphydf" , "nurupo" , "robinlinden" , "sudden6" - , "toktok-releaser" , "zugz" ]