Skip to content

Commit

Permalink
Fix travis builds
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrv committed Sep 21, 2017
1 parent bbeec58 commit f30749b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: emacs-lisp
sudo: false
cache:
directories:
- .cask/
# - .cask/
- $HOME/emacs
- $HOME/.ccache
- $HOME/ycmd
Expand Down Expand Up @@ -31,7 +31,7 @@ env:
- EMACS_VERSION=snapshot COMPILEFLAGS='error-on-warn'
before_install:
# gcc-4.9
- mkdir "${HOME}/bin"
- mkdir -p "${HOME}/bin"
- ln -s "/usr/bin/g++-4.9" "${HOME}/bin/c++"
- ln -s "/usr/bin/gcc-4.9" "${HOME}/bin/cc"
- ln -s "/usr/bin/gcov-4.9" "${HOME}/bin/gcov"
Expand All @@ -46,6 +46,7 @@ before_install:
- travis/install_ycmd.sh

install:
- echo $PATH
- if [[ -n $EMACS_VERSION ]]; then make deps; fi
script:
- if [[ -n $EMACS_VERSION ]]; then make all; fi
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Expand Up @@ -8,8 +8,10 @@ CONVERT = convert
VERSION := $(shell EMACS=$(EMACS) $(CASK) version)
PKGDIR := $(shell EMACS=$(EMACS) $(CASK) package-directory)

# Export the used EMACS to recipe environments
# Export Emacs to goals, mainly for CASK
CASK_EMACS = $(EMACS)
export EMACS
export CASK_EMACS

SRCS = ycmd.el contrib/ycmd-next-error.el

Expand Down

0 comments on commit f30749b

Please sign in to comment.