From f68a1d7c285b2bc9f74b6cb33992b36f2e07c5d4 Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Fri, 22 Feb 2019 11:42:25 +1300 Subject: [PATCH 1/4] Convert tests to use CircleCI instead of Travis --- .circleci/config.yml | 39 +++++++++++++++++++++++++++++++++++++++ .travis.yml | 22 ---------------------- 2 files changed, 39 insertions(+), 22 deletions(-) create mode 100644 .circleci/config.yml delete mode 100644 .travis.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 00000000..7e89c93f --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,39 @@ +version: 2.0 + +# Default actions to perform on each Emacs version +default: &default-steps + steps: + - checkout + - run: apt-get update && apt-get install make + - run: make elpa + - run: emacs --version + - run: make test + - run: make test-bytecomp + +# Enumerated list of Emacs versions +jobs: + test-emacs-25: + docker: + - image: silex/emacs:25-dev + entrypoint: bash + <<: *default-steps + + test-emacs-26: + docker: + - image: silex/emacs:26-dev + entrypoint: bash + <<: *default-steps + + test-emacs-master: + docker: + - image: silex/emacs:master-dev + entrypoint: bash + <<: *default-steps +# +workflows: + version: 2 + ci-test-matrix: + jobs: + - test-emacs-25 + - test-emacs-26 + - test-emacs-master diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index be3656d3..00000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -sudo: false -language: emacs-lisp -env: - - EMACS_BINARY=emacs-25.1-travis MAKE_TEST=test - - EMACS_BINARY=emacs-25.1-travis MAKE_TEST=test-bytecomp - - EMACS_BINARY=emacs-25.2-travis MAKE_TEST=test - - EMACS_BINARY=emacs-25.2-travis MAKE_TEST=test-bytecomp - - EMACS_BINARY=emacs-26.1-travis MAKE_TEST=test - - EMACS_BINARY=emacs-26.1-travis MAKE_TEST=test-bytecomp - - EMACS_BINARY=emacs-26.1-travis MAKE_TEST=test-checks - - EMACS_BINARY=emacs-git-snapshot-travis -matrix: - allow_failures: - - env: EMACS_BINARY=emacs-git-snapshot-travis - fast_finish: true -before_script: - - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh - - evm install $EMACS_BINARY --use --skip - - make elpa -script: - - emacs --version - - make $MAKE_TEST From 07b298bf3cc4d64771cffea7d1b18c52c8367337 Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Tue, 26 Feb 2019 13:57:27 +1300 Subject: [PATCH 2/4] Update CI badge in the README to point to CircleCI --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a2291191..fa89c474 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ [![License GPL 3][badge-license]][copying] [![MELPA][melpa-badge]][melpa-package] [![MELPA Stable][melpa-stable-badge]][melpa-stable-package] -[![travis][badge-travis]][travis] +[![circleci][badge-circleci]][circleci] # Clojure Mode @@ -438,8 +438,8 @@ Distributed under the GNU General Public License; type C-h C-c to vie [melpa-package]: http://melpa.org/#/clojure-mode [melpa-stable-package]: http://stable.melpa.org/#/clojure-mode [COPYING]: http://www.gnu.org/copyleft/gpl.html -[badge-travis]: https://travis-ci.org/clojure-emacs/clojure-mode.svg?branch=master -[travis]: https://travis-ci.org/clojure-emacs/clojure-mode +[badge-circleci]: https://circleci.com/gh/clojure-emacs/clojure-mode.svg?style=svg +[circleci]: https://circleci.com/gh/clojure-emacs/clojure-mode [CIDER]: https://github.com/clojure-emacs/cider [cider-nrepl]: https://github.com/clojure-emacs/cider-nrepl [inf-clojure]: https://github.com/clojure-emacs/inf-clojure From b50c321d5675bfd9142a5b1b401c836cb566788a Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Tue, 26 Feb 2019 13:59:10 +1300 Subject: [PATCH 3/4] Update Circle config to address review comments --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7e89c93f..753fef17 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,4 +1,4 @@ -version: 2.0 +version: 2.1 # Default actions to perform on each Emacs version default: &default-steps @@ -29,7 +29,7 @@ jobs: - image: silex/emacs:master-dev entrypoint: bash <<: *default-steps -# + workflows: version: 2 ci-test-matrix: From 31148c42bac65f4f50a8f0bd9e336623b1c516d4 Mon Sep 17 00:00:00 2001 From: Daniel Compton Date: Wed, 27 Feb 2019 08:07:01 +1300 Subject: [PATCH 4/4] Reorder tests to avoid running test-bytecomp before test-checks --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 753fef17..670bc0c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -8,6 +8,9 @@ default: &default-steps - run: make elpa - run: emacs --version - run: make test + # Make sure to run test-checks before test-bytecomp, as test-bytecomp autogenerates + # files which won't pass test-checks. + - run: make test-checks - run: make test-bytecomp # Enumerated list of Emacs versions