[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole 40900adbe2 04/16: Use basename docker, depend
From: |
ELPA Syncer |
Subject: |
[elpa] externals/hyperbole 40900adbe2 04/16: Use basename docker, depend on update to ensure latest image |
Date: |
Sun, 30 Jun 2024 03:58:23 -0400 (EDT) |
branch: externals/hyperbole
commit 40900adbe2264884428545f591bb348962f44198
Author: Mats Lidell <mats.lidell@lidells.se>
Commit: Mats Lidell <mats.lidell@lidells.se>
Use basename docker, depend on update to ensure latest image
Rename targets from dockerized to the simpler docker. Add dependency
on docker-update to ensure latest docker image is used.
---
ChangeLog | 6 ++++++
Makefile | 20 ++++++++++----------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c8f6c08d40..30321dff55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2024-06-24 Mats Lidell <matsl@gnu.org>
+
+* Makefile (docker, docker-run, docker-update): Use simpler "docker" for
+ the docker targets. Make docker and docker-run depend on docker-update
+ to ensure we always use the latest version of the docker image.
+
2024-06-23 Bob Weiner <rsw@gnu.org>
* Makefile: (dockerized-run): Add to intweractively run dockerized versions
diff --git a/Makefile b/Makefile
index 7cc0b848a1..be7db48a59 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
-# Last-Mod: 23-Jun-24 at 00:16:22 by Bob Weiner
+# Last-Mod: 24-Jun-24 at 23:49:29 by Mats Lidell
#
# Copyright (C) 1994-2023 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
@@ -77,14 +77,14 @@
# make test-all - run all tests starting an
interactive Emacs
# make test test=<test-name> - run a single test or tests
matching the name
#
-# To interactively run a dockerized version of Emacs with
Hyperbole:
-# make dockerized-run - default to running
master
-# make dockerized-run version=27.1 - run Emacs V27.1
+# To interactively run a docker version of Emacs with Hyperbole:
+# make docker-run - default to running master
+# make docker-run version=27.1 - run Emacs V27.1
#
# To build and test a dockerized version of Emacs with Hyperbole:
-# make dockerized - defaults:
version=master targets='clean bin test'
+# make docker - defaults: version=master
targets='clean bin test'
#
-# make dockerized version=28.2 targets='clean bin' - Emacs
28.2 with Hyperbole byte-compiled (possibly natively compiled)
+# make docker version=28.2 targets='clean bin' -
byte-compile Hyperbole with Emacs 28.2
#
# Verify hyperbole installation using different sources:
# make install-<source>
@@ -553,7 +553,7 @@ lint:
-l package-lint.el -f package-lint-batch-and-exit \
$(EL_KOTL) $(EL_SRC)
-# Dockerized versions of Emacs for interactive running and test execution
+# Docker versions of Emacs for interactive running and test execution
# Specify version and targets to run
ifeq ($(origin targets), command line)
@@ -567,14 +567,14 @@ else
DOCKER_VERSION = master-ci
endif
-dockerized:
+docker: docker-update
docker run -v $$(pwd):/hypb -it silex/emacs:${DOCKER_VERSION} bash -c
"cp -a /hypb /hyperbole && make -C hyperbole ${DOCKER_TARGETS}"
-dockerized-run:
+docker-run: docker-update
docker run -v $$(pwd):/hypb -it silex/emacs:${DOCKER_VERSION}
# Update the docker image for the specified version of Emacs
-dockerized-update:
+docker-update:
docker pull silex/emacs:${DOCKER_VERSION}
# Run with coverage. Run tests given by testspec and monitor the
- [elpa] externals/hyperbole updated (d4aaee59fe -> 445a7101a2), ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 17969221cf 01/16: Use compose-mail-other-window for implicit mail address, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 3338f25119 02/16: Merge branch 'master' into use-compose-mail-for-mail-address-ibut, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 23fee3ba1a 03/16: Add support for org face types to support org 9.7 and older, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 40900adbe2 04/16: Use basename docker, depend on update to ensure latest image,
ELPA Syncer <=
- [elpa] externals/hyperbole 43274861b9 08/16: Merge branch 'rsw-prop-updates' into rsw, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole b67454a151 06/16: Merge branch 'master' into rsw, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 6f5aed5b4e 09/16: Merge branch 'rsw' of github.com:rswgnu/hyperbole into rsw, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 1320c37e8b 05/16: hynote.el - Add initial HyNote link support for Org and Org Roam, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 677d4db578 07/16: hui-em-but.el - Add char-property and overlay utility functions, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole d64ade357d 10/16: hui-em-but.el - Rename to "hproperty.el", ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 0c019d9b8f 11/16: test/hui-tests.el - Kill all *info*<#> buffers, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 8a8367189c 12/16: Merge pull request #550 from rswgnu/rsw, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole 4a2b722a03 13/16: Merge branch 'master' into update-docker-targets, ELPA Syncer, 2024/06/30
- [elpa] externals/hyperbole bd1e178a59 15/16: Merge branch 'master' into use-compose-mail-for-mail-address-ibut, ELPA Syncer, 2024/06/30