[nongnu] elpa/coffee-mode 358ab41cb2 3/4: Merge pull request #373 from defunkt/github-actions

[ELPA Syncer]

branch: elpa/coffee-mode
commit 358ab41cb280a81162ce9c0636ef41ce39ca04b4
Merge: 35a41c7d82 1f602d2ab2
Author: Shohei YOSHIDA <syohex@gmail.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #373 from defunkt/github-actions
    
    Switch from travis CI to github actions
---
 .github/workflows/test.yml | 25 +++++++++++++++++++++++++
 .gitignore                 |  2 +-
 .travis.yml                | 14 --------------
 Cask                       |  7 -------
 Makefile                   | 12 +++++-------
 README.md                  |  6 +++---
 test/coffee-highlight.el   |  4 +++-
 7 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 0000000000..d63902c036
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,25 @@
+name: CI
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        emacs_version:
+          - 27.2
+          - 28.2
+          - 29.1
+          - snapshot
+    steps:
+    - uses: purcell/setup-emacs@master
+      with:
+        version: ${{ matrix.emacs_version }}
+
+    - uses: actions/checkout@v4
+    - name: Run tests
+      run: |
+        make test
diff --git a/.gitignore b/.gitignore
index e15865d013..e0b9fbae6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-/.cask/
 *.elc
+*~
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5ab84d44ea..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: generic
-sudo: false
-before_install:
-  - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh 
&& source ./x.sh
-  - evm install $EVM_EMACS --use --skip
-  - cask
-env:
-  - EVM_EMACS=emacs-24.3-travis
-  - EVM_EMACS=emacs-24.4-travis
-  - EVM_EMACS=emacs-24.5-travis
-  - EVM_EMACS=emacs-25.1-travis
-script:
-  - emacs --version
-  - make test
diff --git a/Cask b/Cask
deleted file mode 100644
index bda114430f..0000000000
--- a/Cask
+++ /dev/null
@@ -1,7 +0,0 @@
-(source gnu)
-(source melpa)
-
-(package-file "coffee-mode.el")
-
-(development
- (depends-on "ert"))
diff --git a/Makefile b/Makefile
index a6896bc2f1..e0d6b09d5a 100644
--- a/Makefile
+++ b/Makefile
@@ -7,30 +7,28 @@ else
        EMACS ?= emacs
 endif
 
-CASK ?= cask
-
 LOADPATH = -L .
 LOAD_HELPER = -l test/test-helper.el
 
 test:
-       $(CASK) exec $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
+       $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
                -l test/coffee-command.el \
                -l test/coffee-imenu.el -l test/coffee-highlight.el \
                -l test/coffee-private.el -l test/coffee-syntax.el \
                -f ert-run-tests-batch-and-exit
 
 test-highlight:
-       $(CASK) exec $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
+       $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
                -l test/coffee-highlight.el \
                -f ert-run-tests-batch-and-exit
 
 test-syntax:
-       $(CASK) exec $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
+       $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
                -l test/coffee-syntax.el \
                -f ert-run-tests-batch-and-exit
 
 test-command:
-       $(CASK) exec $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
+       $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
                -l test/coffee-command.el \
                -f ert-run-tests-batch-and-exit
 
@@ -40,6 +38,6 @@ test-imenu:
                -f ert-run-tests-batch-and-exit
 
 test-private:
-       $(CASK) exec $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
+       $(EMACS) -Q -batch $(LOADPATH) $(LOAD_HELPER) \
                -l test/coffee-private.el \
                -f ert-run-tests-batch-and-exit
diff --git a/README.md b/README.md
index 3e0618aad8..f178208e34 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 CoffeeScript Major Mode
 =======================
-[![travis badge][travis-badge]][travis-link] [![melpa 
badge][melpa-badge]][melpa-link] [![melpa stable 
badge][melpa-stable-badge]][melpa-stable-link]
+[![github_actions badge][github-actions-badge]][github-actions-link] [![melpa 
badge][melpa-badge]][melpa-link] [![melpa stable 
badge][melpa-stable-badge]][melpa-stable-link]
 
 An Emacs major mode for [CoffeeScript][cs] and [IcedCoffeeScript][ics].
 
@@ -195,8 +195,8 @@ Please file bugs at 
<https://github.com/defunkt/coffee-mode/issues>
 [elpa]: https://elpa.gnu.org/
 [melpa]: https://melpa.org/
 [melpa-stable]: https://stable.melpa.org/
-[travis-badge]: https://travis-ci.org/syohex/coffee-mode.svg
-[travis-link]: https://travis-ci.org/syohex/coffee-mode
+[github-actions-badge]: 
https://github.com/defunk/coffee-mode/workflows/CI/badge.svg
+[github-actions-link]: https://github.com/defunk/coffee-mode/actions
 [melpa-link]: https://melpa.org/#/coffee-mode
 [melpa-stable-link]: https://stable.melpa.org/#/coffee-mode
 [melpa-badge]: https://melpa.org/packages/coffee-mode-badge.svg
diff --git a/test/coffee-highlight.el b/test/coffee-highlight.el
index b2e34e8b84..26bafd0970 100644
--- a/test/coffee-highlight.el
+++ b/test/coffee-highlight.el
@@ -1066,7 +1066,9 @@ testMethod = (id) ->
     (should (face-at-cursor-p 'font-lock-constant-face))
 
     (forward-cursor-on "#")
-    (should (face-at-cursor-p 'font-lock-comment-face))
+    (if (version<= "28" emacs-version)
+        (should (face-at-cursor-p 'font-lock-comment-delimiter-face))
+      (should (face-at-cursor-p 'font-lock-comment-face)))
 
     (forward-cursor-on "Broken")
     (should (face-at-cursor-p 'font-lock-comment-face))))