From 6a515fc360234b945ac32ad6d5e0da5ceef61ba9 Mon Sep 17 00:00:00 2001 From: Carlo Sciolla Date: Tue, 14 Aug 2018 21:28:13 +0200 Subject: [PATCH 1/6] Add make to the list of installed packages --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9a79011..cf2e108 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ default: &default-steps steps: - checkout - run: apt-get update - - run: apt-get install -y openjdk-8-jre + - run: apt-get install -y openjdk-8-jre make - run: make # Enumerated list of Emacs versions From 9445f0db7d76dc5b0ba6c6ec60ba4f9237992b82 Mon Sep 17 00:00:00 2001 From: Carlo Sciolla Date: Tue, 14 Aug 2018 21:34:27 +0200 Subject: [PATCH 2/6] Install prerequisite software --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cf2e108..4e6a54a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,9 @@ default: &default-steps steps: - checkout - run: apt-get update - - run: apt-get install -y openjdk-8-jre make + - run: apt-get install -y openjdk-8-jre make python git + - run: curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python + - run: export PATH="/root/.cask/bin:$PATH" - run: make # Enumerated list of Emacs versions From 4f4b8ffe912496e5f0f98334fb974c3bb0d9f948 Mon Sep 17 00:00:00 2001 From: Carlo Sciolla Date: Tue, 14 Aug 2018 21:42:28 +0200 Subject: [PATCH 3/6] Command changed, need to sync up the test --- test/plantuml-mode-custom-jar-location-test.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/plantuml-mode-custom-jar-location-test.el b/test/plantuml-mode-custom-jar-location-test.el index d946a56..f826689 100644 --- a/test/plantuml-mode-custom-jar-location-test.el +++ b/test/plantuml-mode-custom-jar-location-test.el @@ -11,11 +11,12 @@ (ert-deftest custom-jar-location () (setq-local plantuml-jar-path "~/.plantuml/plantuml.jar") (should (equal `("-Djava.awt.headless=true" "-jar" - ,(expand-file-name "~/.plantuml/plantuml.jar")) + ,(expand-file-name "~/.plantuml/plantuml.jar") + "-charset" "UTF-8") (plantuml-render-command))) (setq-local plantuml-jar-path "/path/with spaces/plantuml.jar") - (should (equal `("-Djava.awt.headless=true" "-jar" "/path/with spaces/plantuml.jar") + (should (equal `("-Djava.awt.headless=true" "-jar" "/path/with spaces/plantuml.jar" "-charset" "UTF-8") (plantuml-render-command)))) (provide 'plantuml-mode-custom-jar-location-test) From 9d6b6a03a6323f37f834100692f25b135aba8afa Mon Sep 17 00:00:00 2001 From: Carlo Sciolla Date: Tue, 14 Aug 2018 21:51:37 +0200 Subject: [PATCH 4/6] More descriptive steps + ensure Cask is found on path See https://circleci.com/docs/2.0/env-vars/#using-bash_env-to-set-environment-variables --- .circleci/config.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4e6a54a..738ee91 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -4,11 +4,21 @@ version: 2.0 default: &default-steps steps: - checkout - - run: apt-get update - - run: apt-get install -y openjdk-8-jre make python git - - run: curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python - - run: export PATH="/root/.cask/bin:$PATH" - - run: make + - run: + name: Update APT packages + command: apt-get update + - run: + name: Install prerequisites + command: apt-get install -y openjdk-8-jre make python git + - run: + name: Install cask + command: curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python + - run: + name: Make Cask available on the path + command: echo 'export PATH="/root/.cask/bin:$PATH"' >> $BASH_ENV + - run: + name: Run the tests + command: make # Enumerated list of Emacs versions jobs: From 3df9bf31a7f1c9e5b37906735fc86bd1f7c2465f Mon Sep 17 00:00:00 2001 From: Carlo Sciolla Date: Tue, 14 Aug 2018 21:59:34 +0200 Subject: [PATCH 5/6] Remove support for emacs 24 --- .circleci/config.yml | 7 ------- plantuml-mode.el | 3 ++- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 738ee91..95ef2ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -22,12 +22,6 @@ default: &default-steps # Enumerated list of Emacs versions jobs: - test-emacs-24: - docker: - - image: silex/emacs:24 - entrypoint: bash - <<: *default-steps - test-emacs-25: docker: - image: silex/emacs:25 @@ -51,7 +45,6 @@ workflows: version: 2 ci-test-matrix: jobs: - - test-emacs-24 - test-emacs-25 - test-emacs-26 - test-emacs-master diff --git a/plantuml-mode.el b/plantuml-mode.el index 5455075..bf11586 100644 --- a/plantuml-mode.el +++ b/plantuml-mode.el @@ -2,11 +2,12 @@ ;; Filename: plantuml-mode.el ;; Description: Major mode for PlantUML diagrams sources -;; Compatibility: Tested with Emacs 24.3 through 24.5 on OS X 10.10 +;; Compatibility: Tested with Emacs 25 through 27 (current master) ;; Author: Zhang Weize (zwz) ;; Maintainer: Carlo Sciolla (skuro) ;; Keywords: uml plantuml ascii ;; Version: 1.2.6 +;; Package-Requires: ((emacs "25.0")) ;; This file is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by From c5b8d63612a0cd097fb7e645e50236c92ed1174b Mon Sep 17 00:00:00 2001 From: Carlo Sciolla Date: Tue, 14 Aug 2018 22:56:58 +0200 Subject: [PATCH 6/6] Skipping tests against Emacs master --- .circleci/config.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 95ef2ff..0f7642d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -47,4 +47,5 @@ workflows: jobs: - test-emacs-25 - test-emacs-26 - - test-emacs-master + # Testing against master currently hangs on CircleCI + #- test-emacs-master