diff options
| author | Max Kellermann <max@musicpd.org> | 2019-12-24 07:08:54 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2019-12-24 07:51:55 +0100 |
| commit | fa50cdb39e7b8b9b82fc239495967232870a6386 (patch) | |
| tree | 031989e79efaa2cfaa9a9b3d630cb25f7a134080 /.travis.yml | |
| parent | 816ef12088587174315c50e98c0cce7716e04e47 (diff) | |
.travis.yml: escape dollar signs in MATRIX_EVAL
Expand $PATH at evaluation and not at assignment, which fixes the
problem that /usr/lib/ccache was added to $PATH between the
MATRIX_EVAL assignment and its evaluation.
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 8aaa876e6..c0bbb7c00 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: install: - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson env: - - MATRIX_EVAL="export PATH=$HOME/.local/bin:$PATH" + - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH" # Ubuntu Trusty (16.04) with GCC 6 - os: linux @@ -47,7 +47,7 @@ matrix: - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson env: # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068 - - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH" + - MATRIX_EVAL="export CC='ccache gcc-6' CXX='ccache g++-6' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH" # Ubuntu Trusty (16.04) with GCC 8 - os: linux @@ -73,7 +73,7 @@ matrix: - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson env: # use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068 - - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=$HOME/.local/bin:$PATH" + - MATRIX_EVAL="export CC='ccache gcc-8' CXX='ccache g++-8' LDFLAGS=-fuse-ld=gold PATH=\$HOME/.local/bin:\$PATH" - os: osx osx_image: xcode9.3beta |