branch: externals/csharp-mode
commit 30ae13607c9d8174ab488ff58cd0dfe4e5cbd0c2
Merge: e7e96e3 0825112
Author: Jostein Kjønigsen <jost...@kjonigsen.net>
Commit: GitHub <nore...@github.com>

    Merge pull request #150 from josteink/josteink-CI-fix
    
    Update CI-settings
---
 .travis.yml          | 9 +++++----
 csharp-mode-tests.el | 3 +++
 makefile             | 5 ++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a3388fd..48366bb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,13 +11,14 @@ env:
   - EVM_EMACS=emacs-25.1-travis
   - EVM_EMACS=emacs-25.2-travis
   - EVM_EMACS=emacs-25.3-travis
-  - EVM_EMACS=emacs-26.1-travis
-  - EVM_EMACS=emacs-26.2-travis
-  - EVM_EMACS=emacs-git-snapshot-travis
+  - EVM_EMACS=emacs-26.1-travis-linux-xenial
+  - EVM_EMACS=emacs-26.2-travis-linux-xenial
+  - EVM_EMACS=emacs-26.3-travis-linux-xenial
+  - EVM_EMACS=emacs-git-snapshot-travis-linux-xenial
 
 matrix:
   allow_failures:
-    - env: EVM_EMACS=emacs-git-snapshot-travis
+    - env: EVM_EMACS=emacs-git-snapshot-travis-linux-xenial
 
 script:
   - emacs --version
diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index 502aded..85b2618 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -8,6 +8,9 @@
 (package-initialize)
 (add-to-list 'package-archives '("melpa" . 
"https://stable.melpa.org/packages/";))
 
+;; required to resolve SEQ (or anything on elpa) on Emacs25.
+(setq package-check-signature nil)
+
 ;; assess depends on dash 2.12.1, which is no longer available
 ;; installing dash, resolves 2.13.0, and fixes this broken dependency.
 (dolist (p '(dash assess))
diff --git a/makefile b/makefile
index efaf0ca..d7db0eb 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,7 @@
 EMACS="$(shell which emacs)"
 EMACS_CLI=$(EMACS) -Q -batch -L .
 CASK=~/.cask/bin/cask
+TESTHOME=/tmp/emacs
 
 package: build
        $(CASK) package
@@ -9,7 +10,9 @@ build: test
        $(CASK) build
 
 test: *.el
-       + $(EMACS_CLI) -l csharp-mode-tests.el -f ert-run-tests-batch-and-exit
+       rm -rf $(TESTHOME)
+       mkdir -p $(TESTHOME)
+       + HOME=$(TESTHOME) $(EMACS_CLI) -l csharp-mode-tests.el -f 
ert-run-tests-batch-and-exit
 
 clean:
        $(CASK) clean-elc

Reply via email to