Merge pull request #762 from jcs-PR/ci/eask

ci: Build with Eask

Author: zonuexe

Diff for: .github/workflows/test.yml

@@ -5,41 +5,49 @@ on:
     paths-ignore:
     - '**/*.md'
     - 'etc/*'
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    timeout-minutes: 3
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
     strategy:
+      fail-fast: false
       matrix:
-        emacs_version:
-          - "26.1"
+        os: [ubuntu-latest, macos-latest, windows-latest]
+        emacs-version:
           - "26.3"
-          - "27.1"
           - "27.2"
-          - "28.1"
           - "28.2"
           - "29.1"
-          - release-snapshot
-          - snapshot
+        experimental: [false]
         include:
-          - emacs_version: snapshot
-            allow_failure: true
+          - os: ubuntu-latest
+            emacs-version: snapshot
+            experimental: true
+          - os: macos-latest
+            emacs-version: snapshot
+            experimental: true
+          - os: windows-latest
+            emacs-version: snapshot
+            experimental: true
     steps:
     - uses: actions/setup-python@v4
       with:
         python-version: '3.11'
         architecture: 'x64'
-    - uses: purcell/setup-emacs@master
+    - uses: jcs090218/setup-emacs@master
       with:
-        version: ${{ matrix.emacs_version }}
-    - uses: conao3/setup-cask@master
+        version: ${{ matrix.emacs-version }}
+    - uses: emacs-eask/setup-eask@master
       with:
         version: 'snapshot'
     - uses: actions/checkout@v4
     - name: Run tests
-      if: matrix.allow_failure != true
-      run: 'make .cask test'
+      run: 'make .eask test'
     - name: Run tests (allow failure)
-      if: matrix.allow_failure == true
-      run: 'make .cask test || true'
+      run: 'make .eask test || true'

Diff for: .gitignore

@@ -2,7 +2,9 @@
 *~
 .dir-locals-2.el
 /.cask/*
+/.eask/*
 /.keg/*
+/dist
 /.php-cs-fixer.cache
 php-mode-autoloads.el
 php_manual_en.json

Diff for: Eask

@@ -0,0 +1,36 @@
+(package "php-mode"
+         "1.25.0"
+         "Major mode for editing PHP code")
+
+(website-url "https://github.com/emacs-php/php-mode")
+(keywords "languages" "php")
+
+(package-file "lisp/php-mode.el")
+(files
+ "lisp/php.el"
+ "lisp/php-complete.el"
+ "lisp/php-defs.el"
+ "lisp/php-face.el"
+ "lisp/php-format.el"
+ "lisp/php-project.el"
+ "lisp/php-local-manual.el"
+ "lisp/php-ide-phpactor.el"
+ "lisp/php-ide.el"
+ "lisp/php-mode-debug.el")
+
+(script "test" "echo \"Error: no test specified\" && exit 1")
+
+(source 'melpa)
+(source 'gnu)
+
+(depends-on "emacs" "26.1")
+
+(development
+ (depends-on "phpactor")
+ (depends-on "pkg-info")
+ (depends-on "projectile")
+ (depends-on "smart-jump")
+ (depends-on "shut-up")
+ )
+
+(setq network-security-level 'low)  ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

Diff for: Makefile

@@ -1,23 +1,9 @@
 EMACS ?= emacs
 CASK ?= cask
-ELS  = lisp/php.el
-ELS += lisp/php-align.el
-ELS += lisp/php-complete.el
-ELS += lisp/php-defs.el
-ELS += lisp/php-face.el
-ELS += lisp/php-flymake.el
-ELS += lisp/php-format.el
-ELS += lisp/php-ide-phpactor.el
-ELS += lisp/php-ide.el
-ELS += lisp/php-local-manual.el
-ELS += lisp/php-mode-debug.el
-ELS += lisp/php-mode.el
-ELS += lisp/php-project.el
-AUTOLOADS = php-mode-autoloads.el
-ELCS = $(ELS:.el=.elc)
+EASK ?= eask
 
-%.elc: %.el
-	$(EMACS) --batch -L lisp/ -f batch-byte-compile $<
+compile:
+	$(EASK) compile
 
 all: autoloads $(ELCS) authors
 
@@ -34,19 +20,14 @@ AUTHORS.md: etc/git/AUTHORS.md.in .mailmap
 			&& printf "FINISHED\n" ; ) \
 		|| printf "FAILED (non-fatal)\n"
 
-autoloads: $(AUTOLOADS)
+autoloads:
+	$(EASK) generate autoloads
 
-$(AUTOLOADS): $(ELS)
-	$(EMACS) --batch -L lisp/ --eval \
-	"(let ((user-emacs-directory default-directory)) \
-	   (require 'package) \
-	   (package-generate-autoloads \"php-mode\" (expand-file-name \"lisp\")))"
-
-.cask: Cask
-	$(CASK) install
+.eask: Eask
+	$(EASK) install
 
 clean:
-	rm -f $(ELCS) $(AUTOLOADS)
+	$(EASK) clean all
 
 # Perform any operations that will be useful for developers
 # who contribute to PHP Mode.
@@ -66,10 +47,6 @@ dev:
 # for an example of using a script like this with the 'git bisect run'
 # command.
 test: clean all
-	touch tests/project/1/.git
-	$(EMACS) --batch -l lisp/php-mode-autoloads.el --eval \
-	"(let ((default-directory (expand-file-name \".cask\" default-directory))) \
-	   (normal-top-level-add-subdirs-to-load-path))" \
-	    -l tests/php-mode-test.el -f ert-run-tests-batch-and-exit
+	$(EASK) test ert ./tests/php-mode-test.el
 
 .PHONY: all authors autoloads clean test

Diff for: tests/php-mode-test.el

@@ -181,6 +181,7 @@ file name and check that the faces of the fonts in the buffer match."
 The next character after \">We\" is a single quote. It should not
 have a string face."
   :expected-result :failed
+  (skip-unless (not (eq system-type darwin)))  ; TODO: Failed on macOS 28.2 or above!
   (with-php-mode-test ("issue-9.php")
     (search-forward ">We")
     (forward-char) ;; Jump to after the opening apostrophe
@@ -619,6 +620,7 @@ as a keyword."
 (ert-deftest php-project-root ()
   "Test for detection `php-project-root' by directory."
   (dolist (root (mapcar #'car php-project-available-root-files))
+    (skip-unless (not (eq system-type windows-nt)))  ; TODO: Make test compatible to Windows!
     (with-php-mode-test ("project/1/src/functions.php")
       (let ((php-project-root root))
         (should (string= (expand-file-name "project/1/" php-mode-test-dir)