Explorar o código

Merge pull request #4036 from puremourning/update-ycmd

Update ycmd
Ben Jackson %!s(int64=2) %!d(string=hai) anos
pai
achega
06dbd05f68
Modificáronse 3 ficheiros con 22 adicións e 2 borrados
  1. 1 1
      .github/workflows/ci.yml
  2. 20 0
      .mergify.yml
  3. 1 1
      third_party/ycmd

+ 1 - 1
.github/workflows/ci.yml

@@ -66,7 +66,7 @@ jobs:
     - name: Install dependencies
       run: sudo -H pip3 install -r python/test_requirements.txt
     - name: Build ycmd
-      run: python3 ./install.py --ts-completer --clangd-completer --java-completer
+      run: python3 ./install.py --force-sudo --ts-completer --clangd-completer --java-completer
     - name: Run tests in old vim
       # System vim should be oldest supported.
       if: matrix.vim == 'old'

+ 20 - 0
.mergify.yml

@@ -48,3 +48,23 @@ pull_request_rules:
         name: default
       comment:
         message: Thanks for sending a PR!
+
+  - name: Manual merge on Pipelines and Maintainer Override from owner PR
+    conditions:
+      - base=master
+      - author=puremourning
+      - status-success=ubuntu-20.04 - Python 3.6 x64
+      - status-success=macos-10.15 - Python 3.6 x64
+      - status-success=windows-2019 - Python 3.9 x64
+      - status-success=windows-2019 - Python 3.9 x86
+      - status-success=Vim tests - new
+      - status-success=Vim tests - old
+
+      - "#changes-requested-reviews-by=0"
+      - label="Ship It!"
+    actions:
+      queue:
+        method: merge
+        name: default
+      comment:
+        message: Thanks for sending a PR!

+ 1 - 1
third_party/ycmd

@@ -1 +1 @@
-Subproject commit ba5814d3810c21ef9868d70ba7a8c7eef9c1d276
+Subproject commit d1707c14883ced0e32fcca9c0f5dbd6849b5f751