Merge branch 'master' into typelessvar

Author: puremourning

.github/workflows/build.yaml

@@ -18,7 +18,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Insatll requirements'
-      run: pip3 install --user -r dev_requirements.txt
+      run: pip3 install  --user -r dev_requirements.txt
     - name: 'Run flake8'
       run: '$HOME/.local/bin/flake8 python3/ *.py'
   VimscriptLint:
@@ -27,7 +27,7 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: 'Install requirements'
-      run: pip3 install --user -r dev_requirements.txt
+      run: pip3 install  --user -r dev_requirements.txt
     - name: 'Run vint'
       run: $HOME/.local/bin/vint autoload/ compiler/ plugin/ tests/ syntax/
 
@@ -81,7 +81,7 @@ jobs:
         VIMSPECTOR_MIMODE: gdb
 
     - name: "Upload test logs"
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: 'test-logs-${{ runner.os }}-${{ matrix.runtime }}'
@@ -97,7 +97,7 @@ jobs:
     #     SSH_PASS: ${{ secrets.SSH_PASS }}
 
   MacOS:
-    runs-on: 'macos-12'
+    runs-on: 'macos-13'
     strategy:
       fail-fast: false
       matrix:
@@ -113,7 +113,7 @@ jobs:
         brew update-reset
         brew doctor || true
         brew cleanup || true
-        for p in vim go tcl-tk llvm lua luajit love neovim coreutils; do
+        for p in vim go tcl-tk@8 llvm lua luajit love neovim coreutils; do
           brew install $p || brew outdated $p || brew upgrade $p
         done
         brew reinstall icu4c
@@ -122,11 +122,11 @@ jobs:
         brew link --overwrite go
         # latest neovim doesn't work on python 3.12
         # https://github.com/neovim/pynvim/issues/538
-        pip3 install --user 'pynvim @ git+https://github.com/neovim/pynvim'
+        pip3 install --break-system-packages --user 'pynvim @ git+https://github.com/neovim/pynvim'
       name: 'Install vim and deps'
 
     - name: 'Install requirements'
-      run: pip3 install --user -r dev_requirements.txt
+      run: pip3 install --break-system-packages --user -r dev_requirements.txt
 
     - run: go install github.com/go-delve/delve/cmd/dlv@latest
       name: 'Install Delve for Go'
@@ -163,7 +163,7 @@ jobs:
         VIMSPECTOR_MIMODE: lldb
 
     - name: "Upload test logs"
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: 'test-logs-${{ runner.os }}-${{ matrix.runtime }}'

.mergify.yml

@@ -1,5 +1,67 @@
 # https://blog.mergify.com/strict-mode-deprecation/
 queue_rules:
+  - name: duplicated default from Merge owner PR when all checks passed
+    queue_conditions:
+      - author=puremourning
+      - base=master
+      - status-success=code-review/reviewable
+      - "#changes-requested-reviews-by=0"
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+    merge_conditions:
+      # CI https://doc.mergify.io/conditions.html#github-actions
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+      #- status-success=MacOS (nvim)
+
+    merge_method: merge
+  - name: duplicated default from Merge auto pr when approved
+    queue_conditions:
+      - author=VimspectorUpdateBot
+      - label=auto
+      - base=master
+      - status-success=code-review/reviewable
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+    merge_conditions:
+      # CI https://doc.mergify.io/conditions.html#github-actions
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+      #- status-success=MacOS (nvim)
+
+    merge_method: merge
+  - name: duplicated default from Merge PR when all checks passed
+    queue_conditions:
+      - author!=puremourning
+      - base=master
+      - status-success=code-review/reviewable
+      - "#approved-reviews-by>=1"
+      - "#changes-requested-reviews-by=0"
+      - approved-reviews-by=puremourning
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+    merge_conditions:
+      # CI https://doc.mergify.io/conditions.html#github-actions
+      - status-success=PythonLint
+      - status-success=VimscriptLint
+      - status-success=Linux (vim)
+      - status-success=Linux (nvim)
+      - status-success=MacOS (vim)
+      #- status-success=MacOS (nvim)
+
+    merge_method: merge
   - name: default
     # These define the conditions to get out of the merge queue
     conditions:
@@ -11,6 +73,7 @@ queue_rules:
       - status-success=MacOS (vim)
       #- status-success=MacOS (nvim)
 
+
 pull_request_rules:
   - name: Merge owner PR when all checks passed
     # These define the conditions to get into the merge queue
@@ -28,11 +91,7 @@ pull_request_rules:
       - status-success=MacOS (vim)
       #- status-success=MacOS (nvim)
     actions: &merge-actions
-      queue:
-        method: merge
-        name: default
       delete_head_branch: {}
-
   - name: Merge auto pr when approved
     conditions:
       - author=VimspectorUpdateBot
@@ -44,7 +103,6 @@ pull_request_rules:
       - "#changes-requested-reviews-by=0"
     actions:
       <<: *merge-actions
-
   - name: Merge PR when all checks passed
     # These define the conditions to get into the merge queue
     conditions:
@@ -66,3 +124,8 @@ pull_request_rules:
       <<: *merge-actions
       comment:
         message: Thanks for sending a PR!
+  - name: Merge PR when all checks passed + Merge auto pr when approved + Merge owner
+      PR when all checks passed
+    conditions: []
+    actions:
+      queue: