procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use debian:bookworm for emba tests (don't merge)

Browse source 
There are problems with treesitter installation from debian:sid.

* test/infra/Dockerfile.emba (emacs-base): Use debian:bookworm.
(emacs-eglot, emacs-tree-sitter): Use emacs-base.
(emacs-native-comp): Install libgccjit-12-dev.
This commit is contained in:
Michael Albinus 2025-03-23 09:33:57 +01:00
parent 84abd43f42
commit c6a11128d5
1 changed files with 4 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
test/infra/Dockerfile.emba
View file

@ -24,7 +24,7 @@
# Maintainer: Ted Zlatanov <tzz@lifelogs.com> # Maintainer: Ted Zlatanov <tzz@lifelogs.com>
# URL: https://emba.gnu.org/emacs/emacs # URL: https://emba.gnu.org/emacs/emacs
FROM debian:bullseye as emacs-base FROM debian:bookworm as emacs-base
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
@ -60,16 +60,7 @@ RUN ./autogen.sh autoconf
RUN ./configure --with-file-notification=gfile RUN ./configure --with-file-notification=gfile
RUN make -j `nproc` bootstrap RUN make -j `nproc` bootstrap
# Debian bullseye doesn't provide proper packages. So we use Debian FROM emacs-base as emacs-eglot
# sid for this.
FROM debian:sid as emacs-eglot
# This corresponds to emacs-base.
RUN apt-get update && \
apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev \
libxml2-dev libdbus-1-dev libacl1-dev acl git texinfo gdb \
&& rm -rf /var/lib/apt/lists/*
# Install clangd, tsserver. # Install clangd, tsserver.
RUN apt-get update && \ RUN apt-get update && \
@ -112,16 +103,7 @@ RUN make -j `nproc` bootstrap
# --eval '(package-install (quote company))' \ # --eval '(package-install (quote company))' \
# --eval '(package-install (quote yasnippet))' # --eval '(package-install (quote yasnippet))'
# Debian bullseye doesn't provide proper packages. So we use Debian FROM emacs-base as emacs-tree-sitter
# sid for this.
FROM debian:sid as emacs-tree-sitter
# This corresponds to emacs-base.
RUN apt-get update && \
apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
libc-dev gcc g++ make autoconf automake libncurses-dev gnutls-dev \
libxml2-dev libdbus-1-dev libacl1-dev acl git texinfo gdb \
&& rm -rf /var/lib/apt/lists/*
# Install tree-sitter library. # Install tree-sitter library.
RUN apt-get update && \ RUN apt-get update && \
@ -183,7 +165,7 @@ FROM emacs-base as emacs-native-comp
# The libgccjit version must correspond to the gcc version. # The libgccjit version must correspond to the gcc version.
RUN apt-get update && \ RUN apt-get update && \
apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \ apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
libgccjit-10-dev zlib1g-dev \ libgccjit-12-dev zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
FROM emacs-native-comp as emacs-native-comp-speed0 FROM emacs-native-comp as emacs-native-comp-speed0