masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-05 19:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Backport: Fix tree-sitter tests on Emba

Browse source 
* test/infra/Dockerfile.emba: Use tree-sitter-rust v0.23.3 in
order to match ABI version of libtree-sitter0.

(cherry picked from commit 788c9cfb62)
This commit is contained in:
Michael Albinus 2025-04-15 14:17:25 +02:00
parent 2b535a9c77
commit 8792d3431b
1 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
test/infra/Dockerfile.emba
View file

@ -117,11 +117,16 @@ RUN ./autogen.sh autoconf
RUN ./configure --with-tree-sitter RUN ./configure --with-tree-sitter
RUN make -j `nproc` bootstrap RUN make -j `nproc` bootstrap
# Install language grammars. # Install language grammars. The ABI versions of libtree-sitter0 and
# the respective grammars must match. The grammar ABI version is determined by
# grep LANGUAGE_VERSION /path/to/grammar-repo/src/parser.c
RUN mkdir -p /root/.emacs.d/tree-sitter RUN mkdir -p /root/.emacs.d/tree-sitter
RUN git config --global http.sslverify "false" RUN git config --global http.sslverify "false"
# See https://github.com/emacs-tree-sitter/tree-sitter-langs/tree/master/repos # See https://github.com/emacs-tree-sitter/tree-sitter-langs/tree/master/repos
RUN src/emacs -Q --batch \ RUN src/emacs -Q --batch \
--eval \
'(message "ABI min version %d max version %d" \
(treesit-library-abi-version t) (treesit-library-abi-version))' \
--eval '(setq \ --eval '(setq \
treesit-extra-load-path (list "/root/.emacs.d/tree-sitter") \ treesit-extra-load-path (list "/root/.emacs.d/tree-sitter") \
treesit-language-source-alist \ treesit-language-source-alist \
@ -141,7 +146,7 @@ RUN src/emacs -Q --batch \
(lua "https://github.com/tree-sitter-grammars/tree-sitter-lua") \ (lua "https://github.com/tree-sitter-grammars/tree-sitter-lua") \
(python "https://github.com/tree-sitter/tree-sitter-python") \ (python "https://github.com/tree-sitter/tree-sitter-python") \
(ruby "https://github.com/tree-sitter/tree-sitter-ruby") \ (ruby "https://github.com/tree-sitter/tree-sitter-ruby") \
(rust "https://github.com/tree-sitter/tree-sitter-rust") \ (rust "https://github.com/tree-sitter/tree-sitter-rust" "v0.23.3") \
(tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") \ (tsx "https://github.com/tree-sitter/tree-sitter-typescript" "master" "tsx/src") \
(typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src"))))' \ (typescript "https://github.com/tree-sitter/tree-sitter-typescript" "master" "typescript/src"))))' \
--eval '(dolist (lang (mapcar (quote car) treesit-language-source-alist)) \ --eval '(dolist (lang (mapcar (quote car) treesit-language-source-alist)) \