diff --git a/.travis.yml b/.travis.yml index 3c9416d..a4114df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ sudo: true env: global: - CURL="curl -fsSkL --retry 9 --retry-delay 9" + - OX_HUGO_TMP_DIR="/tmp/${USER}/ox-hugo-dev" - PANDOC_VERSION=2.5 matrix: # https://github.com/npostavs/emacs-travis/releases @@ -23,6 +24,8 @@ install: - tar xf emacs-bin-${EMACS_VERSION}.tar.gz -C / - export EMACS=/tmp/emacs/bin/emacs - $EMACS --version + # Add the yet-to-be Makefile downloaded pandoc to PATH + - export PATH="${OX_HUGO_TMP_DIR}/pandoc/bin:${PATH}" script: # Don't run "make doc" on travis; it's finicky diff --git a/test/setup-ox-hugo.el b/test/setup-ox-hugo.el index d0ce90e..85611b5 100644 --- a/test/setup-ox-hugo.el +++ b/test/setup-ox-hugo.el @@ -1,4 +1,4 @@ -;; Time-stamp: <2019-01-02 18:03:58 kmodi> +;; Time-stamp: <2019-01-02 18:26:47 kmodi> ;; Setup to export Org files to Hugo-compatible Markdown using ;; `ox-hugo' in an "emacs -Q" environment. @@ -250,13 +250,6 @@ Emacs installation. If Emacs is installed using ;; https://www.gnu.org/software/emacs/manual/html_node/elisp/Time-Zone-Rules.html (setenv "TZ" "UTC") - ;; Use Pandoc binaries from `ox-hugo-tmp-dir'/bin. - (setenv "PATH" (concat (file-name-as-directory - (expand-file-name "bin" - (expand-file-name "pandoc" ox-hugo-tmp-dir))) - ":" - (getenv "PATH"))) - ;; Force the locate to en_US for the tests. (set-locale-environment "en_US.UTF-8") (setenv "LANGUAGE" "en_US.UTF-8")