Skip to content

Commit 4745cac

Browse files
switch build system (#471)
1 parent 9de08c1 commit 4745cac

13 files changed

+66
-40
lines changed

.ert-runner

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

.github/workflows/ci.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
paths-ignore:
6+
- '**.md'
7+
pull_request:
8+
paths-ignore:
9+
- '**.md'
10+
11+
jobs:
12+
test:
13+
name: mix test (Emacs ${{matrix.emacs_version}} | Elixir ${{matrix.elixir}} | Erlang/OTP ${{matrix.otp}})
14+
runs-on: ubuntu-latest
15+
strategy:
16+
matrix:
17+
emacs_version: ['27.1', '26.3', '25.2']
18+
otp: ['21.3', '23.2']
19+
elixir: ['1.8.2', '1.11.4']
20+
21+
steps:
22+
- name: Setup Emacs
23+
uses: purcell/setup-emacs@master
24+
with:
25+
version: ${{matrix.emacs_version}}
26+
27+
- name: Setup OTP + Elixir
28+
uses: erlef/setup-elixir@v1
29+
with:
30+
otp-version: ${{matrix.otp}}
31+
elixir-version: ${{matrix.elixir}}
32+
33+
- name: Install Eldev
34+
run: curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/github-eldev | sh
35+
36+
- name: Check out the source code
37+
uses: actions/checkout@v2
38+
39+
- name: Test the project
40+
run: |
41+
eldev -p -dtT test

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,9 @@
33
/.cask/
44
/dist/
55
*-emacs-elixir-format.ex
6+
elixir-mode-autoloads.el
7+
8+
# Added automatically by ‘eldev init’.
9+
/.eldev
10+
/Eldev-local
11+

.travis.yml

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

Cask

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

Eldev

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
; -*- mode: emacs-lisp; lexical-binding: t; no-byte-compile: t -*-
2+
3+
;; Autodetermined by `eldev init'.
4+
(eldev-use-package-archive 'melpa)
5+
6+
(eldev-use-plugin 'autoloads)
7+
(eldev-use-plugin 'undercover)
8+
9+
(eldev-add-loading-roots 'test "tests")
10+
11+
(eldev-add-extra-dependencies 'test 's)

elixir-mode.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
;; Created: Mon Nov 7 2011
1212
;; Keywords: languages elixir
1313
;; Version: 2.4.0
14-
;; Package-Requires: ((emacs "24") (pkg-info "0.4"))
14+
;; Package-Requires: ((emacs "25") (pkg-info "0.6"))
1515

1616
;; This file is not a part of GNU Emacs.
1717

test/elixir-format-test.el renamed to tests/elixir-format-test.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
;;; elixir-format-test.el --- Basic tests for elixir-format
22

33
;;; Code:
4+
(require 'test-helper)
45

56
(ert-deftest elixir-format-indents-a-buffer ()
67
(when elixir-formatter-supported

test/elixir-mode-font-test.el renamed to tests/elixir-mode-font-test.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
;; https://github.com/lunaryorn/puppet-mode/blob/master/test/puppet-mode-test.el
88

99
;;; Code:
10+
(require 'test-helper)
1011

1112
(defun elixir-test-face-at (pos &optional content)
1213
"Get the face at POS in CONTENT.

test/elixir-mode-helper-test.el renamed to tests/elixir-mode-helper-test.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
;;; elixir-mode-helper-test.el --- Tests for helper functions
22

33
;;; Code:
4+
(require 'test-helper)
45

56
(ert-deftest check-if-currently-inside-heredoc ()
67
(should (with-temp-buffer

test/elixir-mode-indentation-test.el renamed to tests/elixir-mode-indentation-test.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
;; passes.
99

1010
;;; Code:
11+
(require 'test-helper)
1112

1213
(elixir-def-indentation-test indent-use-dot-module-newline
1314
(:tags '(indentation))

test/elixir-mode-moving-test.el renamed to tests/elixir-mode-moving-test.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
;;; elixir-mode-moving-test.el --- Tests for moving cursor functions
22

33
;;; Code:
4+
(require 'test-helper)
45

56
(ert-deftest beginning-of-defun ()
67
:tags '(moving)

test/test-helper.el renamed to tests/test-helper.el

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
(require 'ert-x) ; `ert-with-test-buffer'
99
(require 'cl-lib) ; `cl-defmacro'
10+
(require 's)
1011

1112
(message "Running tests on Emacs %s" emacs-version)
1213

@@ -62,10 +63,6 @@
6263
(insert indented)
6364
(should (equal indented ,expected-output)))))))
6465

65-
(when (s-contains? "--win" (getenv "ERT_RUNNER_ARGS"))
66-
(defun ert-runner/run-tests-batch-and-exit (selector)
67-
(ert-run-tests-interactively selector)))
68-
6966
(setq elixir-format-elixir-path (executable-find "elixir"))
7067
(setq elixir-format-mix-path (executable-find "mix"))
7168

@@ -100,4 +97,5 @@ end")
10097
end
10198
")
10299

100+
(provide 'test-helper)
103101
;;; test-helper.el ends here

0 commit comments

Comments
 (0)