branch: externals/hyperbole
commit 8a4f5cfa6961b5282c4e764c55494d053f0cd41d
Merge: db3aa628b6 d267daa6e4
Author: Robert Weiner <[email protected]>
Commit: GitHub <[email protected]>
Merge branch 'master' into refactor-hywiki-tests
---
ChangeLog | 5 +++++
Makefile | 8 ++++++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dcf0e312e4..78c4c26bdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,11 @@
(hywiki-tests--get-page-list-when-new-wiki-directory): Verify cache is
empty for a new hywiki-directory.
+* Makefile (dockerized-update): Target to update (pull) the Emacs docker
+ image.
+ (dockerized): Copy source to docker so not local workspace is affected
+ when running targets in the docker environment.
+
2024-06-22 Bob Weiner <[email protected]>
* hywiki.el (hywiki-active-in-current-buffer-p): Fix to highlight HyWikiWords
diff --git a/Makefile b/Makefile
index b72306f74e..0c8e564b79 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
-# Last-Mod: 19-May-24 at 10:58:02 by Bob Weiner
+# Last-Mod: 22-Jun-24 at 11:35:21 by Mats Lidell
#
# Copyright (C) 1994-2023 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
@@ -563,7 +563,11 @@ DOCKER_VERSION = master-ci
endif
dockerized:
- docker run -v $$(pwd):/hyperbole -it silex/emacs:${DOCKER_VERSION} bash
-c "make -C hyperbole ${DOCKER_TARGETS}"
+ docker run -v $$(pwd):/hypb -it silex/emacs:${DOCKER_VERSION} bash -c
"cp -a /hypb /hyperbole && make -C hyperbole ${DOCKER_TARGETS}"
+
+# Update the docker image for the specified version of Emacs
+dockerized-update:
+ docker pull silex/emacs:${DOCKER_VERSION}
# Run with coverage. Run tests given by testspec and monitor the
# coverage for the specified file.
