masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-04 11:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'emacs-30' of git.savannah.gnu.org:/srv/git/emacs into emacs-30

Browse source
This commit is contained in:
Eli Zaretskii 2025-06-09 17:02:03 +03:00
commit 51b9e92ab8
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/infra/Dockerfile.emba
View file

@ -34,10 +34,9 @@ RUN apt-get update && \
FROM emacs-base as emacs-inotify FROM emacs-base as emacs-inotify
# We install clangd for Eglot tests.
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 \
inotify-tools clangd \ inotify-tools \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY . /checkout COPY . /checkout

4
test/infra/gitlab-ci.yml
View file

@ -93,9 +93,9 @@ default:
- test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name} - test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/test ${test_name}
- test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/config.log ${test_name} || true - test -n "$(docker ps -aq -f name=${test_name})" && docker cp ${test_name}:checkout/config.log ${test_name} || true
- test -n "$(docker ps -aq -f name=${test_name})" && docker rm ${test_name} - test -n "$(docker ps -aq -f name=${test_name})" && docker rm ${test_name}
- find ${test_name} ! \( -name "*.log" -o -name ${EMACS_TEST_JUNIT_REPORT} \) -type f -delete - test -d ${test_name} && find ${test_name} ! \( -name "*.log" -o -name ${EMACS_TEST_JUNIT_REPORT} \) -type f -delete
# BusyBox find does not know -empty. # BusyBox find does not know -empty.
- find ${test_name} -type d -depth -exec rmdir {} + 2>/dev/null - test -d ${test_name} && find ${test_name} -type d -depth -exec rmdir {} + 2>/dev/null
.build-template: .build-template:
needs: [] needs: []