branch: elpa/mentor
commit f027f6e2382d11444d3a38513eb6ed91283b808a
Author: Stefan Kangas <stefankan...@gmail.com>
Commit: Stefan Kangas <stefankan...@gmail.com>
Fix GitHub CI workflow
---
.github/workflows/test.yml | 28 +++++++++++++++++++++++++---
Makefile | 33 ++++++++++++++++++++++++++++++++-
2 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0e2ee48be7..ae22d07fef 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,5 +1,6 @@
name: test
on: [ push, pull_request ]
+permissions: {}
jobs:
test:
runs-on: ubuntu-latest
@@ -19,8 +20,29 @@ jobs:
- snapshot
steps:
+ - name: Checkout async
+ uses: actions/checkout@v3
+ with:
+ repository: jwiegley/emacs-async
+ path: async
+
+ - name: Checkout url-scgi
+ uses: actions/checkout@v3
+ with:
+ repository: skangas/url-scgi
+ path: url-scgi
+
+ - name: Checkout xml-rpc
+ uses: actions/checkout@v3
+ with:
+ repository: xml-rpc-el/xml-rpc-el
+ path: xml-rpc
+
- name: Checkout mentor
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
+ with:
+ repository: skangas/mentor
+ path: mentor
- name: Install emacs
uses: purcell/setup-emacs@master
@@ -28,7 +50,7 @@ jobs:
version: ${{ matrix.emacs_version }}
- name: Build mentor
- run: make all
+ run: make -C mentor all
- name: Test mentor
- run: make test
+ run: make -C mentor test
diff --git a/Makefile b/Makefile
index 1cc9eab545..92790b3a35 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,42 @@
+TOP := $(dir $(lastword $(MAKEFILE_LIST)))
+
EMACS=emacs
EMACS_BATCH = $(EMACS) -Q -batch
ELPADIR = $(HOME)/.emacs.d/elpa
SUBDIRS = $(shell find $(ELPADIR) -mindepth 1 -maxdepth 1 -type d)
EMACS_LOADPATH = -L . $(patsubst %,-L %, $(SUBDIRS)) -L ../url-scgi
-EMACS_LOAD = $(EMACS_BATCH) $(EMACS_LOADPATH)
TARGET=$(patsubst %.el,%.elc,$(wildcard *.el))
+### Find libraries
+
+ASYNC_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/async-[.0-9]*' 2> /dev/null | \
+ sort | tail -n 1)
+ifeq "$(ASYNC_DIR)" ""
+ ASYNC_DIR = $(TOP)../async
+endif
+
+URL_SCGI_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/url-scgi-[.0-9]*' 2> /dev/null | \
+ sort | tail -n 1)
+ifeq "$(URL_SCGI_DIR)" ""
+ URL_SCGI_DIR = $(TOP)../url-scgi
+endif
+
+XML_RPC_DIR ?= $(shell \
+ find -L $(ELPA_DIR) -maxdepth 1 -regex '.*/xml-rpc-[.0-9]*' 2> /dev/null | \
+ sort | tail -n 1)
+ifeq "$(XML_RPC_DIR)" ""
+ XML_RPC_DIR = $(TOP)../xml-rpc
+endif
+
+EMACS_LOAD = $(EMACS_BATCH) $(EMACS_LOADPATH)
+EMACS_LOAD += -L $(ASYNC_DIR)
+EMACS_LOAD += -L $(URL_SCGI_DIR)
+EMACS_LOAD += -L $(XML_RPC_DIR)
+
+### Targets
+
.PHONY: all clean tags test check-declare
.PRECIOUS: %.elc
