Update ycmd

Fix mergify for macos 12
ycm-core · Mar 9, 2023 · aaebb55 · aaebb55
1 parent 230f28d
commit aaebb55
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.mergify.yml b/.mergify.yml
@@ -4,7 +4,7 @@ queue_rules:
     # These define the conditions to get out of the merge queue
     conditions:
       - status-success=ubuntu-20.04 - Python 3.8 x64
-      - status-success=macos-10.15 - Python 3.8 x64
+      - status-success=macos-12 - Python 3.8 x64
       - status-success=windows-2019 - Python 3.9 x64
       - status-success=windows-2019 - Python 3.9 x86
       - status-success=Vim tests - new
@@ -16,7 +16,7 @@ pull_request_rules:
       - base=master
       - "#approved-reviews-by>=2"
       - status-success=ubuntu-20.04 - Python 3.8 x64
-      - status-success=macos-10.15 - Python 3.8 x64
+      - status-success=macos-12 - Python 3.8 x64
       - status-success=windows-2019 - Python 3.9 x64
       - status-success=windows-2019 - Python 3.9 x86
       - status-success=Vim tests - new
@@ -33,7 +33,7 @@ pull_request_rules:
     conditions:
       - base=master
       - status-success=ubuntu-20.04 - Python 3.8 x64
-      - status-success=macos-10.15 - Python 3.8 x64
+      - status-success=macos-12 - Python 3.8 x64
       - status-success=windows-2019 - Python 3.9 x64
       - status-success=windows-2019 - Python 3.9 x86
       - status-success=Vim tests - new
@@ -51,7 +51,7 @@ pull_request_rules:
       - base=master
       - author=puremourning
       - status-success=ubuntu-20.04 - Python 3.8 x64
-      - status-success=macos-10.15 - Python 3.8 x64
+      - status-success=macos-12 - Python 3.8 x64
       - status-success=windows-2019 - Python 3.9 x64
       - status-success=windows-2019 - Python 3.9 x86
       - status-success=Vim tests - new

diff --git a/third_party/ycmd b/third_party/ycmd