Skip to content

Commit 41a4ea1

Browse files
authored
Replace Cask with Eask, fix CI in Windows (#258)
* Replace Cask with Eask * Update build.yml * No need to install python * Update build.yml * Update makefile * Update test * Install dev dep * Add missing deP * Remove install packages for test * Bump node version to 16
1 parent 856ecbc commit 41a4ea1

File tree

5 files changed

+41
-66
lines changed

5 files changed

+41
-66
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,62 +9,37 @@ on:
99
workflow_dispatch:
1010

1111
jobs:
12-
unix-build:
12+
build:
1313
runs-on: ${{ matrix.os }}
1414
strategy:
15+
fail-fast: false
1516
matrix:
16-
os: [ubuntu-18.04, ubuntu-latest]
17-
emacs: [26.1, 26.2, 26.3, 27.1, 27.2, snapshot]
17+
os: [ubuntu-latest, macos-latest, windows-latest]
18+
emacs-version: [26.1, 26.2, 26.3, 27.1, 27.2, 28.1, snapshot]
1819

1920
steps:
2021
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
2122
- uses: actions/checkout@v2
2223

23-
- uses: actions/setup-python@v2
24-
with:
25-
python-version: "3.6"
26-
architecture: "x64"
27-
2824
- uses: purcell/setup-emacs@master
25+
if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest'
2926
with:
30-
version: ${{ matrix.emacs }}
31-
32-
- uses: conao3/setup-cask@master
33-
with:
34-
version: 0.8.4
35-
36-
- name: paths
37-
run: |
38-
echo "$HOME/.cask/bin" >> $GITHUB_PATH
39-
40-
- name: Run a multi-line script
41-
run: |
42-
emacs --version
43-
make test
27+
version: ${{ matrix.emacs-version }}
4428

45-
windows-build:
46-
runs-on: windows-latest
47-
strategy:
48-
matrix:
49-
emacs: [26.1, 26.2, 26.3, 27.1, 27.2, snapshot]
50-
51-
steps:
52-
- uses: actions/checkout@v2
53-
54-
- uses: actions/setup-python@v2
29+
- uses: jcs090218/setup-emacs-windows@master
30+
if: matrix.os == 'windows-latest'
5531
with:
56-
python-version: "3.6"
57-
architecture: "x64"
32+
version: ${{ matrix.emacs-version }}
5833

59-
- uses: jcs090218/setup-emacs-windows@master
34+
- uses: actions/setup-node@v2
6035
with:
61-
version: ${{ matrix.emacs }}
36+
node-version: '16'
6237

63-
- uses: conao3/setup-cask@master
38+
- uses: emacs-eask/setup-eask@master
6439
with:
65-
version: 0.8.4
40+
version: 'snapshot'
6641

6742
- name: Run a multi-line script
6843
run: |
6944
emacs --version
70-
make test
45+
make ci

Cask

Lines changed: 0 additions & 4 deletions
This file was deleted.

Eask

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
(package "csharp-mode"
2+
"1.1.1"
3+
"C# mode derived mode")
4+
5+
(package-file "csharp-mode.el")
6+
7+
(source "gnu")
8+
(source "melpa")
9+
10+
(depends-on "emacs" "26.1")
11+
12+
(development
13+
(depends-on "assess")
14+
(depends-on "dash")
15+
(depends-on "m-buffer"))
16+
17+
(setq network-security-level 'low) ; see https://github.com/jcs090218/setup-emacs-windows/issues/156#issuecomment-932956432

csharp-mode-tests.el

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,22 +23,6 @@
2323
(require 'csharp-mode)
2424
(require 'package)
2525

26-
;; development only packages, not declared as a package-dependency
27-
;; FIXME: loading a .el file from `load-path' should not change user's settings
28-
;; like that. It can happen without the user explicitly requesting it!
29-
(package-initialize)
30-
(add-to-list 'package-archives '("melpa" . "https://stable.melpa.org/packages/"))
31-
32-
;; required to resolve SEQ (or anything on elpa) on Emacs25.
33-
(setq package-check-signature nil)
34-
35-
;; assess depends on dash 2.12.1, which is no longer available
36-
;; installing dash, resolves 2.13.0, and fixes this broken dependency.
37-
(dolist (p '(dash assess))
38-
(when (not (package-installed-p p))
39-
(package-refresh-contents)
40-
(package-install p)))
41-
4226
;;; test-helper functions
4327

4428
(defmacro assess-face-in-text= (testee &rest assessments)

makefile

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
EMACS ?= emacs
2-
CASK ?= cask
2+
EASK ?= eask
33

44
TESTHOME=/tmp/emacs
55

6-
package: build
7-
$(CASK) package
6+
ci: build test
87

9-
build: test
10-
$(CASK) build
8+
package:
9+
$(EASK) package
10+
11+
build: package
12+
$(EASK) install
1113

1214
test:
1315
@echo "Testing..."
14-
@$(CASK) $(EMACS) -Q -batch -L . -l csharp-mode-tests.el -f ert-run-tests-batch-and-exit
16+
$(EASK) install --dev
17+
$(EASK) ert csharp-mode-tests.el
1518

1619
clean:
17-
$(CASK) clean-elc
20+
$(EASK) clean-elc
1821
rm -rf dist
1922
rm -rf $(TESTHOME)
2023

0 commit comments

Comments
 (0)