oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

.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.
This commit is contained in:
Max Kellermann 2019-12-24 07:08:54 +01:00
parent 816ef12088
commit fa50cdb39e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -21,7 +21,7 @@ matrix:
install: install:
- /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
env: env:
- MATRIX_EVAL="export PATH=$HOME/.local/bin:$PATH" - MATRIX_EVAL="export PATH=\$HOME/.local/bin:\$PATH"
# Ubuntu Trusty (16.04) with GCC 6 # Ubuntu Trusty (16.04) with GCC 6
- os: linux - os: linux
@ -47,7 +47,7 @@ matrix:
- /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
env: env:
# use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068 # 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 # Ubuntu Trusty (16.04) with GCC 8
- os: linux - os: linux
@ -73,7 +73,7 @@ matrix:
- /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson - /usr/bin/python3.6 $HOME/.local/bin/pip install --user meson
env: env:
# use gold as workaround for https://sourceware.org/bugzilla/show_bug.cgi?id=17068 # 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 - os: osx
osx_image: xcode9.3beta osx_image: xcode9.3beta