mirror of
				https://github.com/neovim/neovim.git
				synced 2025-11-03 17:24:29 +00:00 
			
		
		
		
	Merge pull request #6896 from jamessan/clang-bump
ci: Bump clang version to 4.0
This commit is contained in:
		
							
								
								
									
										12
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										12
									
								
								.travis.yml
									
									
									
									
									
								
							@@ -10,7 +10,7 @@ env:
 | 
				
			|||||||
    # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM
 | 
					    # http://docs.travis-ci.com/user/speeding-up-the-build/#Paralellizing-your-build-on-one-VM
 | 
				
			||||||
    - MAKE_CMD="make -j2"
 | 
					    - MAKE_CMD="make -j2"
 | 
				
			||||||
    # Update PATH for pip.
 | 
					    # Update PATH for pip.
 | 
				
			||||||
    - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:/usr/lib/llvm-symbolizer-3.9/bin:$PATH"
 | 
					    - PATH="$(python2.7 -c 'import site; print(site.getuserbase())')/bin:/usr/lib/llvm-symbolizer-4.0/bin:$PATH"
 | 
				
			||||||
    # Build directory for Neovim.
 | 
					    # Build directory for Neovim.
 | 
				
			||||||
    - BUILD_DIR="$TRAVIS_BUILD_DIR/build"
 | 
					    - BUILD_DIR="$TRAVIS_BUILD_DIR/build"
 | 
				
			||||||
    # Build directory for third-party dependencies.
 | 
					    # Build directory for third-party dependencies.
 | 
				
			||||||
@@ -53,12 +53,12 @@ jobs:
 | 
				
			|||||||
  include:
 | 
					  include:
 | 
				
			||||||
    - stage: sanitizers
 | 
					    - stage: sanitizers
 | 
				
			||||||
      os: linux
 | 
					      os: linux
 | 
				
			||||||
      compiler: clang-3.9
 | 
					      compiler: clang-4.0
 | 
				
			||||||
      env: >
 | 
					      env: >
 | 
				
			||||||
        CLANG_SANITIZER=ASAN_UBSAN
 | 
					        CLANG_SANITIZER=ASAN_UBSAN
 | 
				
			||||||
        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
 | 
					        CMAKE_FLAGS="$CMAKE_FLAGS -DPREFER_LUA=ON"
 | 
				
			||||||
    - os: linux
 | 
					    - os: linux
 | 
				
			||||||
      compiler: clang-3.9
 | 
					      compiler: clang-4.0
 | 
				
			||||||
      env: CLANG_SANITIZER=TSAN
 | 
					      env: CLANG_SANITIZER=TSAN
 | 
				
			||||||
    - stage: normal builds
 | 
					    - stage: normal builds
 | 
				
			||||||
      os: linux
 | 
					      os: linux
 | 
				
			||||||
@@ -98,13 +98,13 @@ addons:
 | 
				
			|||||||
  apt:
 | 
					  apt:
 | 
				
			||||||
    sources:
 | 
					    sources:
 | 
				
			||||||
      - ubuntu-toolchain-r-test
 | 
					      - ubuntu-toolchain-r-test
 | 
				
			||||||
      - llvm-toolchain-trusty-3.9
 | 
					      - llvm-toolchain-trusty-4.0
 | 
				
			||||||
    packages:
 | 
					    packages:
 | 
				
			||||||
      - autoconf
 | 
					      - autoconf
 | 
				
			||||||
      - automake
 | 
					      - automake
 | 
				
			||||||
      - apport
 | 
					      - apport
 | 
				
			||||||
      - build-essential
 | 
					      - build-essential
 | 
				
			||||||
      - clang-3.9
 | 
					      - clang-4.0
 | 
				
			||||||
      - cmake
 | 
					      - cmake
 | 
				
			||||||
      - cscope
 | 
					      - cscope
 | 
				
			||||||
      - g++-5-multilib
 | 
					      - g++-5-multilib
 | 
				
			||||||
@@ -115,7 +115,7 @@ addons:
 | 
				
			|||||||
      - language-pack-tr
 | 
					      - language-pack-tr
 | 
				
			||||||
      - libc6-dev-i386
 | 
					      - libc6-dev-i386
 | 
				
			||||||
      - libtool
 | 
					      - libtool
 | 
				
			||||||
      - llvm-3.9-dev
 | 
					      - llvm-4.0-dev
 | 
				
			||||||
      - locales
 | 
					      - locales
 | 
				
			||||||
      - pkg-config
 | 
					      - pkg-config
 | 
				
			||||||
      - unzip
 | 
					      - unzip
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user