Skip to content

Commit 92e681d

Browse files
committed
Bump Emacs version in GitHub action and install updated packages
Now using `use-package` to better install them, and setting `load-prefer-newer` which was probably the bug.
1 parent 22fed1a commit 92e681d

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

.github/workflows/emacs-test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ jobs:
2525
run: tools/azurePipelinesBuild.ps1
2626

2727
- name: Install Emacs
28-
uses: purcell/setup-emacs@v4.0
28+
uses: purcell/setup-emacs@master
2929
with:
30-
version: '28.1'
30+
version: '28.2'
3131

3232
- name: Run ERT
33-
run: emacs -batch -l ert -l test/emacs-test.el -f ert-run-tests-batch-and-exit
33+
run: |
34+
emacs -Q --batch -f package-refresh-contents --eval "(package-install 'eglot)"
35+
emacs -Q --batch -l test/emacs-test.el -f ert-run-tests-batch-and-exit

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ App_Data
1111
*.sln.cache
1212
*.suo
1313
TestResults
14+
test/emacs-session.json
1415
[Tt]humbs.db
1516
buildd.*
1617
release/

test/emacs-test.el

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
;;; Code:
1010

11-
(require 'ert)
11+
;; Avoid using old packages.
12+
(setq load-prefer-newer t)
1213

1314
;; Improved TLS Security.
1415
(with-eval-after-load 'gnutls
@@ -21,16 +22,17 @@
2122
(add-to-list 'package-archives
2223
'("melpa" . "https://melpa.org/packages/") t)
2324
(package-initialize)
25+
(package-refresh-contents)
26+
27+
(require 'ert)
2428

2529
(require 'flymake)
2630

2731
(unless (package-installed-p 'powershell)
28-
(package-refresh-contents)
2932
(package-install 'powershell))
3033
(require 'powershell)
3134

3235
(unless (package-installed-p 'eglot)
33-
(package-refresh-contents)
3436
(package-install 'eglot))
3537
(require 'eglot)
3638

0 commit comments

Comments
 (0)