Fork updates from ycm-core/YouCompleteMe master

.github/workflows/ci.yml

@@ -12,67 +12,79 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        runs-on: [ ubuntu-20.04, macos-10.15, windows-2019 ]
+        runs-on: [ ubuntu-24.04, macos-14, windows-2019 ]
         python-arch: [ 'x64' ]
-        python-version: [ 3.6 ]
         include:
+          - runs-on: macos-14
+            python-arch: 'arm64'
           - runs-on: windows-2019
             python-arch: 'x86'
-            python-version: 3.9
-          - runs-on: windows-2019
-            python-arch: 'x64'
-            python-version: 3.9
         exclude:
-          - runs-on: windows-2019
-            python-arch: 'x64'
-            python-version: 3.6
+          - runs-on: macos-14
+            python-arch: "x64"
     env:
       COVERAGE: true
-    name: "${{ matrix.runs-on }} - Python ${{ matrix.python-version }} ${{ matrix.python-arch }}"
+    name: "${{ matrix.runs-on }} - Python 3.9 ${{ matrix.python-arch }}"
     runs-on: ${{ matrix.runs-on }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
     - name: Install Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: ${{ matrix.python-version }}
+        python-version: "3.9"
         architecture: ${{ matrix.python-arch }}
     - name: Run pip
       run: python3 -m pip install -r python/test_requirements.txt
     - name: Run tests
       run: python3 run_tests.py --quiet python/ycm/tests
+    - name: summarise coverage
+      run: coverage xml
     - name: Upload coverage data
-      run: codecov --name "${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.python-arch }}"
+      uses: codecov/codecov-action@v4
+      with:
+        name: "${{ runner.os }}-3.9-${{ matrix.python-arch }}"
+        token: ${{ secrets.CODECOV_TOKEN }}
 
   vim-tests:
     strategy:
       fail-fast: false
       matrix:
         vim: [ 'new', 'old' ]
+        arch: [ 'x86_64' ]
     runs-on: ubuntu-20.04
-    container: 'youcompleteme/ycm-vim-py3:test'
+    container: 'youcompleteme/ycm-vim-${{ matrix.arch }}-py3:test'
     env:
       COVERAGE: true
       YCM_TEST_STDOUT: true
     name: "Vim tests - ${{ matrix.vim }}"
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: recursive
         fetch-depth: 0
     - name: Install dependencies
-      run: sudo -H pip3 install -r python/test_requirements.txt
+      run: sudo -H pip3 install --break-system-packages -r python/test_requirements.txt
+    - name: Install Java
+      uses: actions/setup-java@v4
+      with:
+        java-version: 17
+        distribution: 'temurin'
     - 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'
       run: ./test/run_vim_tests --vim /usr/bin/vim
     - name: Run tests in new vim
       if: matrix.vim == 'new'
       run: ./test/run_vim_tests
+    - name: Combine and summarise coverage
+      run: coverage combine && coverage xml
     - name: Upload coverage data
-      run: codecov --name "vim-tests-${{ matrix.vim }}"
+      uses: codecov/codecov-action@v4
+      with:
+        name: "vim-tests-${{ matrix.vim }}"
+        token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/update_vim_docs.yaml

@@ -0,0 +1,35 @@
+name: "Update vim docs"
+
+on:
+  push:
+    branches:
+      - master
+    paths:
+      - 'README.md'
+  workflow_dispatch:
+
+jobs:
+  update-vim-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: 'Update local repo'
+        run: './update-vim-docs'
+      - name: 'Check diffs'
+        run: 'git diff'
+      - name: 'Create pull request'
+        uses: peter-evans/create-pull-request@v4
+        id: cpr
+        with:
+          token: ${{ secrets.VIMSPECTOR_UPDATE_BOT_PAT }}
+          push-to-fork: VimspectorUpdateBot/YouCompleteMe
+          commit-message: "Update vim docs"
+          branch: 'auto/update-vim-docs'
+          delete-branch: true
+          title: "[Auto] Update vim docs"
+          body: "Update the vim docs after recent changes"
+          labels: "auto"
+      - name: Check outputs
+        run: |
+          echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
+          echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"

.mergify.yml

@@ -3,8 +3,8 @@ queue_rules:
   - name: default
     # These define the conditions to get out of the merge queue
     conditions:
-      - status-success=ubuntu-20.04 - Python 3.6 x64
-      - status-success=macos-10.15 - Python 3.6 x64
+      - status-success=ubuntu-24.04 - Python 3.9 x64
+      - status-success=macos-14 - Python 3.9 arm64
       - status-success=windows-2019 - Python 3.9 x64
       - status-success=windows-2019 - Python 3.9 x86
       - status-success=Vim tests - new
@@ -15,24 +15,25 @@ pull_request_rules:
     conditions:
       - base=master
       - "#approved-reviews-by>=2"
-      - status-success=ubuntu-20.04 - Python 3.6 x64
-      - status-success=macos-10.15 - Python 3.6 x64
+      - status-success=ubuntu-24.04 - Python 3.9 x64
+      - status-success=macos-14 - Python 3.9 arm64
       - 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
       - status-success=code-review/reviewable
-    actions:
+    actions: &merge-actions
       queue:
         method: merge
         name: default
       comment:
         message: Thanks for sending a PR!
+
   - name: Manual merge on Azure Pipelines and Maintainer Override
     conditions:
       - base=master
-      - status-success=ubuntu-20.04 - Python 3.6 x64
-      - status-success=macos-10.15 - Python 3.6 x64
+      - status-success=ubuntu-24.04 - Python 3.9 x64
+      - status-success=macos-14 - Python 3.9 arm64
       - status-success=windows-2019 - Python 3.9 x64
       - status-success=windows-2019 - Python 3.9 x86
       - status-success=Vim tests - new
@@ -43,8 +44,32 @@ pull_request_rules:
 
       - label="Ship It!"
     actions:
-      queue:
-        method: merge
-        name: default
-      comment:
-        message: Thanks for sending a PR!
+      <<: *merge-actions
+
+  - name: Manual merge on Pipelines and Maintainer Override from owner PR
+    conditions:
+      - base=master
+      - author=puremourning
+      - status-success=ubuntu-24.04 - Python 3.9 x64
+      - status-success=macos-14 - Python 3.9 arm64
+      - 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:
+      <<: *merge-actions
+
+  - name: Merge auto pr when approved
+    conditions:
+      - author=VimspectorUpdateBot
+      - label=auto
+      - base=master
+      # Review
+      - status-success=code-review/reviewable
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+    actions:
+      <<: *merge-actions

.vimspector.json

@@ -34,18 +34,19 @@
         "type": "debugpy",
         "request": "launch",
 
-        "cwd": "${workspaceRoot}/python",
+        "cwd": "${workspaceRoot}",
         "stopOnEntry": false,
         "console": "integratedTerminal",
         "justMyCode": true,
+        "logToFile": true,
+        "showReturnValue": true,
 
         "debugOptions": [],
 
-        "module": "pytest",
+        "module": "unittest",
         "python": "${python}",
         "args": [
           "-v",
-          "--tb=native",
           "${Test}"
         ],
         "env": {

CODE_OF_CONDUCT.md

@@ -1,7 +1,7 @@
 We, the maintainers, pledge to treat all contributors with respect and require that contributors reciprocate.
 
-The maintainers will not tolerate unwelcome, inpolite, abusive or unprofessional behaviour. 
+The maintainers will not tolerate unwelcome, impolite, abusive or unprofessional behaviour.
 
 At the discretion of the maintainers, users who persist in behaving in a way that is unwelcome may be subject to a ban.
 
-This applies to all interractions related to this project and any associated projects.
+This applies to all interactions related to this project and any associated projects.