Skip to content

Commit c6f2078

Browse files
committed
Merge remote-tracking branch 'origin/master' into data-breakpoints
2 parents c94b34b + af13695 commit c6f2078

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1202
-655
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ body:
2323
- type: dropdown
2424
id: issue-works-in-vim
2525
attributes:
26-
label: Works in vim?
26+
label: Is it reproducible in vim?
2727
description: If you are using Neovim, does the issue reproduce in Vim?
2828
options:
29-
- Reproducable in Vim
29+
- Reproducible in Vim
3030
- Only broken in Neovim
3131
validations:
3232
required: true
@@ -49,8 +49,8 @@ body:
4949
label: Sample project works?
5050
description: Try one of the sample projects in `support/test` for your file type. Does that work? If not, use the sample project for crating your reproduction case.
5151
options:
52-
- Not reproducable with sample project
53-
- Reproducable with sample project
52+
- Not reproducible with sample project
53+
- Reproducible with sample project
5454
- No sample project for this filetype
5555
validations:
5656
required: true

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ contact_links:
33
- name: Questions and support
44
url: 'https://matrix.to/#/#vimspector_Lobby:gitter.im'
55
about: Please ask and answer questions here.
6-
- name: Discussions
7-
url: https://github.com/puremourning/vimspector/discussions
8-
about: Please post questions and useful hints here
96
- name: Support for additional languages
107
url: https://github.com/puremourning/vimspector/wiki/languages
118
about: Please see here for information on support for additional languages

.github/workflows/build.yaml

Lines changed: 7 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,8 @@ jobs:
8787
name: 'test-logs-${{ runner.os }}-${{ matrix.runtime }}'
8888
path: 'tests/logs/**/*'
8989

90-
- name: 'Package'
91-
if: matrix.runtime == 'vim'
92-
run: ./make_package linux ${{ github.run_id }}
93-
9490
# TODO: test the tarball
9591

96-
- name: "Upload package"
97-
if: matrix.runtime == 'vim'
98-
uses: actions/upload-artifact@v2
99-
with:
100-
name: 'package-linux'
101-
path: 'package/linux-${{ github.run_id }}.tar.gz'
102-
10392
# - name: Start SSH session if failed
10493
# uses: luchihoratiu/debug-via-ssh@main
10594
# if: failure()
@@ -114,22 +103,26 @@ jobs:
114103
matrix:
115104
runtime:
116105
- vim
117-
- nvim
106+
# - nvim ; MacOS in GHA is so slow, this seems to cause lots of
107+
# flakiness for neovim and I have like 0 patience with trying to
108+
# understand why.
118109
steps:
119110
- uses: actions/checkout@v3
120111

121112
- run: |
122113
brew update-reset
123114
brew doctor || true
124115
brew cleanup || true
125-
for p in vim go tcl-tk llvm lua luajit love neovim; do
116+
for p in vim go tcl-tk llvm lua luajit love neovim coreutils; do
126117
brew install $p || brew outdated $p || brew upgrade $p
127118
done
128119
brew reinstall icu4c
129120
brew link --overwrite python
130121
brew link --overwrite vim
131122
brew link --overwrite go
132-
pip3 install --user neovim
123+
# latest neovim doesn't work on python 3.12
124+
# https://github.com/neovim/pynvim/issues/538
125+
pip3 install --user 'pynvim @ git+https://github.com/neovim/pynvim'
133126
name: 'Install vim and deps'
134127
135128
- name: 'Install requirements'
@@ -176,66 +169,11 @@ jobs:
176169
name: 'test-logs-${{ runner.os }}-${{ matrix.runtime }}'
177170
path: 'tests/logs/**/*'
178171

179-
- name: 'Package'
180-
if: matrix.runtime == 'vim'
181-
run: ./make_package macos ${{ github.run_id }}
182-
183172
# TODO: test the tarball
184173

185-
- name: "Upload package"
186-
if: matrix.runtime == 'vim'
187-
uses: actions/upload-artifact@v2
188-
with:
189-
name: 'package-macos'
190-
path: 'package/macos-${{ github.run_id }}.tar.gz'
191-
192174
# - name: Start SSH session if failed
193175
# uses: luchihoratiu/debug-via-ssh@main
194176
# if: failure() || cancelled()
195177
# with:
196178
# NGROK_AUTH_TOKEN: ${{ secrets.NGROK_AUTH_TOKEN }}
197179
# SSH_PASS: ${{ secrets.SSH_PASS }}
198-
199-
PublishRelease:
200-
runs-on: 'ubuntu-20.04'
201-
needs:
202-
- Linux
203-
- MacOS
204-
if: github.ref == 'refs/heads/master'
205-
steps:
206-
- name: 'Download artifacts'
207-
id: download_artifacts
208-
uses: actions/download-artifact@v2
209-
210-
- name: 'Create Release'
211-
id: create_release
212-
uses: actions/create-release@v1
213-
env:
214-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
215-
with:
216-
tag_name: ${{ github.run_id }}
217-
release_name: Build ${{ github.run_id }}
218-
draft: false
219-
prerelease: true
220-
221-
- name: 'Upload Linux Package'
222-
id: upload-release-asset-linux
223-
uses: actions/upload-release-asset@v1
224-
env:
225-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
226-
with:
227-
upload_url: ${{ steps.create_release.outputs.upload_url }}
228-
asset_path: ${{ steps.download_artifacts.outputs.download-path }}/package-linux/linux-${{ github.run_id }}.tar.gz
229-
asset_name: vimspector-linux-${{ github.run_id }}.tar.gz
230-
asset_content_type: application/gzip
231-
232-
- name: 'Upload MacOS Package'
233-
id: upload-release-asset-macos
234-
uses: actions/upload-release-asset@v1
235-
env:
236-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
237-
with:
238-
upload_url: ${{ steps.create_release.outputs.upload_url }}
239-
asset_path: ${{ steps.download_artifacts.outputs.download-path }}/package-macos/macos-${{ github.run_id }}.tar.gz
240-
asset_name: vimspector-macos-${{ github.run_id }}.tar.gz
241-
asset_content_type: application/gzip

.mergify.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ queue_rules:
99
- status-success=Linux (vim)
1010
- status-success=Linux (nvim)
1111
- status-success=MacOS (vim)
12-
- status-success=MacOS (nvim)
12+
#- status-success=MacOS (nvim)
1313

1414
pull_request_rules:
1515
- name: Merge owner PR when all checks passed
@@ -26,7 +26,7 @@ pull_request_rules:
2626
- status-success=Linux (vim)
2727
- status-success=Linux (nvim)
2828
- status-success=MacOS (vim)
29-
- status-success=MacOS (nvim)
29+
#- status-success=MacOS (nvim)
3030
actions: &merge-actions
3131
queue:
3232
method: merge
@@ -61,7 +61,7 @@ pull_request_rules:
6161
- status-success=Linux (vim)
6262
- status-success=Linux (nvim)
6363
- status-success=MacOS (vim)
64-
- status-success=MacOS (nvim)
64+
#- status-success=MacOS (nvim)
6565
actions:
6666
<<: *merge-actions
6767
comment:

CONTRIBUTING.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,23 @@ information when something goes wrong that's not a clear Vim traceback.
4040
If you just want to see the Vimspector log file, use `:VimspectorToggleLog`,
4141
which will tail it in a little window (doesn't work on Windows).
4242

43+
## Discussions
44+
45+
GitHub discussions are not for *bug reports* or *feature requests* - please
46+
use GitHub Issues for that.
47+
48+
If you're not sure if your issue is a bug, feature, or just configuration
49+
error, then feel free to use the Q&A Discussion and/or the Matrix channel
50+
to check. Don't be offended if the response is that it's a bug or feature
51+
requests requiring raising a full Issue.
52+
53+
This is mainly for project management purposes, as:
54+
55+
* the Issues template contains a lot of data that maintainers require to
56+
diagnose them, and
57+
* feature requests can be put in Projects and tracked; requests in
58+
Discussions are easily forgotten.
59+
4360
## Issues
4461

4562
The GitHub issue tracker is for *bug reports* and *features requests* for the
@@ -156,6 +173,19 @@ When contributing pull requests, I ask that:
156173

157174
### Running the tests locally
158175

176+
Requirements for running the tests:
177+
178+
* Linux or macOS
179+
* Supported Vim or Neovim version (ideally both)
180+
* acsiinema instaled (`pip3 install --user asciinema`)
181+
* `timeout` installed (on macOS: `brew install coreutils`)
182+
* various other dependencies for the individual debuggers.
183+
184+
The simplest way to run the tests is using the container image, as all
185+
dependencies are there for you. If you decide not to, then the best way to work
186+
out what's required is to look at either the `Dockerfile` (for Linux) or the
187+
`.github/workflows/build.yaml` (for macOS).
188+
159189
There are 2 ways:
160190

161191
1. In the docker container. The CI tests for linux run in a container, so as to

0 commit comments

Comments
 (0)