Bläddra i källkod

Update ycmd

Fix mergify for macos 12
Ben Jackson 2 år sedan
förälder
incheckning
aaebb55b65
2 ändrade filer med 5 tillägg och 5 borttagningar
  1. 4 4
      .mergify.yml
  2. 1 1
      third_party/ycmd

+ 4 - 4
.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

+ 1 - 1
third_party/ycmd

@@ -1 +1 @@
-Subproject commit 6c9a7a8d60a7a631042f3d845ed6e73a9e565495
+Subproject commit de23065b7810ae478f823ef9088ca2e80d52950a