diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-26 20:09:11 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-26 20:09:11 +0200 |
| commit | 92c098d18e435a7a762409744ebe2dbb3746ed77 (patch) | |
| tree | f40f79621fd985c2cb126ef75be1399ab7b39d1c /.travis.yml | |
| parent | 285b189260e2d753454449e429f2caa17e1c39a5 (diff) | |
| download | vim-git-92c098d18e435a7a762409744ebe2dbb3746ed77.tar.gz | |
patch 8.2.0828: Travis: regexp patttern doesn't work everywherev8.2.0828
Problem: Travis: regexp patttern doesn't work everywhere.
Solution: Use [:blank:] instead of \b. (Ozaki Kiichi, closes #6146)
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 7c1ecbca5..ef96f084d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -125,7 +125,12 @@ script: # Append various warning flags to CFLAGS. # BSD sed needs backup extension specified. sed -i.bak -f ci/config.mk.sed ${SRCDIR}/auto/config.mk - sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk + if [[ "${TRAVIS_OS_NAME}" = "osx" ]]; then + # On macOS, the entity of gcc is clang. + sed -i.bak -f ci/config.mk.clang.sed ${SRCDIR}/auto/config.mk + else + sed -i.bak -f ci/config.mk.${CC}.sed ${SRCDIR}/auto/config.mk + fi make ${SHADOWOPT} -j${NPROC} fi - echo -en "travis_fold:end:build\\r\\033[0K" @@ -141,11 +146,10 @@ script: - do_test make ${SHADOWOPT} ${TEST} && FOLD_MARKER=travis_fold - echo -en "${FOLD_MARKER}:end:test\\r\\033[0K" - -# instead of a 2*2*8 matrix (2*os + 2*compiler + 8*env), -# exclude some builds on mac os x and linux -# on mac os x "tiny" is always without GUI -# linux: 2*compiler + 5*env + mac: 2*compiler + 2*env +# Instead of using all environments with both compilers on both systems, +# exclude some builds on mac os x and linux. +# On mac os x "tiny" is always without GUI, use 2 compilers in 2 environments. +# Linux: 2 compilers on some of the environments + gcc on os390 jobs: include: - <<: *osx |