branch: elpa/symbol-overlay
commit a505a10bb1675bf5a7fbfab8a2a0a29bf21c10df
Author: Steve Purcell <st...@sanityinc.com>
Commit: Steve Purcell <st...@sanityinc.com>

    Separate lint and compile steps in CI
    
    package-lint no longer works on Emacs 24.3, so we run it
    separately (and just once) using a newer Emacs version.
---
 .github/workflows/test.yml | 19 ++++++++++++++-----
 Makefile                   |  8 ++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e95f8b7444..5dde1230b4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,6 +7,16 @@ on:
     - '**.md'
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: purcell/setup-emacs@master
+      with:
+        version: 29.2
+    - uses: actions/checkout@v4
+    - name: Run tests
+      run: make package-lint
+
   build:
     runs-on: ubuntu-latest
     strategy:
@@ -18,16 +28,15 @@ jobs:
           - 25.3
           - 26.1
           - 26.3
-          - 27.1
           - 27.2
-          - 28.1
           - 28.2
+          - 29.2
           - snapshot
     steps:
     - uses: purcell/setup-emacs@master
       with:
         version: ${{ matrix.emacs_version }}
 
-    - uses: actions/checkout@v2
-    - name: Run tests
-      run: make
+    - uses: actions/checkout@v4
+    - name: Check byte compilation
+      run: make compile
diff --git a/Makefile b/Makefile
index 9bb1cd306f..9e8c82d2b7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 EMACS ?= emacs
 
 # A space-separated list of required package names
-NEEDED_PACKAGES = package-lint seq
+DEPS = seq
 
 INIT_PACKAGES="(progn \
   (require 'package) \
   (push '(\"melpa\" . \"https://melpa.org/packages/\";) package-archives) \
   (package-initialize) \
-  (dolist (pkg '(${NEEDED_PACKAGES})) \
+  (dolist (pkg '(PACKAGES)) \
     (unless (package-installed-p pkg) \
       (unless (assoc pkg package-archive-contents) \
         (package-refresh-contents)) \
@@ -17,10 +17,10 @@ INIT_PACKAGES="(progn \
 all: compile package-lint clean-elc
 
 package-lint:
-       ${EMACS} -Q --eval ${INIT_PACKAGES} -batch -f 
package-lint-batch-and-exit symbol-overlay.el
+       ${EMACS} -Q --eval $(subst PACKAGES,package-lint,${INIT_PACKAGES}) 
-batch -f package-lint-batch-and-exit symbol-overlay.el
 
 compile: clean-elc
-       ${EMACS} -Q --eval ${INIT_PACKAGES} -L . -batch -f batch-byte-compile 
*.el
+       ${EMACS} -Q --eval $(subst PACKAGES,${DEPS},${INIT_PACKAGES}) -L . 
-batch -f batch-byte-compile *.el
 
 clean-elc:
        rm -f f.elc

Reply via email to