Skip to content

Commit

Permalink
Update PATH for Travis so that Pandoc bins are found during test
Browse files Browse the repository at this point in the history
  • Loading branch information
kaushalmodi committed Jan 2, 2019
1 parent 4bea80d commit 1e7fcde
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
9 changes: 1 addition & 8 deletions test/setup-ox-hugo.el
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 1e7fcde

Please sign in to comment.