From 8efd64bdbfa67543700d274f3b0108ae80cf464e Mon Sep 17 00:00:00 2001
From: Tom Ritter <tom@mozilla.com>
Date: Wed, 7 Dec 2022 17:20:54 +0000
Subject: [PATCH] Bug 1700396: Bump Updatebot version for phabricator fixes
 r=andi

Correctly handle group phab reviewers and submit two separate
phabricator revisions for two patches

Differential Revision: https://phabricator.services.mozilla.com/D163872
---
 python/mozbuild/mozbuild/vendor/moz_yaml.py       | 6 +++---
 taskcluster/docker/updatebot/updatebot-version.sh | 3 ++-
 toolkit/components/pdfjs/moz.yaml                 | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/python/mozbuild/mozbuild/vendor/moz_yaml.py b/python/mozbuild/mozbuild/vendor/moz_yaml.py
index bdc6bba94497..26aba091d868 100644
--- a/python/mozbuild/mozbuild/vendor/moz_yaml.py
+++ b/python/mozbuild/mozbuild/vendor/moz_yaml.py
@@ -19,14 +19,14 @@ from voluptuous import (
     All,
     Boolean,
     FqdnUrl,
+    In,
+    Invalid,
     Length,
     Match,
     Msg,
     Required,
     Schema,
     Unique,
-    In,
-    Invalid,
 )
 from yaml.error import MarkedYAMLError
 
@@ -282,7 +282,7 @@ updatebot:
 
   # TODO: allow multiple users to be specified
   # Phabricator username for a maintainer of the library, used for assigning
-  # reviewers
+  # reviewers. For a review group, preface with #, such as "#build""
   maintainer-phab: tjr
 
   # Bugzilla email address for a maintainer of the library, used for needinfos
diff --git a/taskcluster/docker/updatebot/updatebot-version.sh b/taskcluster/docker/updatebot/updatebot-version.sh
index f213379ac395..5f0719c64ba0 100644
--- a/taskcluster/docker/updatebot/updatebot-version.sh
+++ b/taskcluster/docker/updatebot/updatebot-version.sh
@@ -1 +1,2 @@
-export UPDATEBOT_REVISION=f073fe25319c2f91c97576393ad04346bbad1ed6
+export UPDATEBOT_REVISION=d646ac13bd300241fdf03e529fcf37d231f10bfc
+
diff --git a/toolkit/components/pdfjs/moz.yaml b/toolkit/components/pdfjs/moz.yaml
index f2505b35d71c..77c6db22d8d9 100644
--- a/toolkit/components/pdfjs/moz.yaml
+++ b/toolkit/components/pdfjs/moz.yaml
@@ -48,7 +48,7 @@ vendoring:
       args: ['{revision}']
 
 updatebot:
-    maintainer-phab: "pdfjs-reviewers"
+    maintainer-phab: "#pdfjs-reviewers"
     maintainer-bz: cdenizet@mozilla.com
     fuzzy-query: "'debug | 'opt !san !android"
     fuzzy-paths: