From c18f991a683d6e90322f447c2bb08a08018a9e13 Mon Sep 17 00:00:00 2001 From: rhysd Date: Sun, 10 Jun 2018 22:04:01 +0900 Subject: [PATCH] CI: Separate running linters to another job on Travis CI because running linters takes the longest time among CI jobs --- .travis.yml | 16 ++++++++-------- scripts/coverage.sh | 11 +++++++++++ scripts/install-vim.sh | 3 +++ scripts/run-lint-on-ci.sh | 6 ++++++ 4 files changed, 28 insertions(+), 8 deletions(-) create mode 100755 scripts/coverage.sh diff --git a/.travis.yml b/.travis.yml index 902ee51a0..17c8f532b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,13 @@ matrix: env: - VIM_VERSION=master - THEMIS_PROFILE=vim-profile-master.txt - - RUN_LINT=true - os: osx osx_image: xcode8.3 env: - THEMIS_PROFILE=vim-profile-osx.txt + - os: linux + env: + - RUN_LINT=true addons: apt: @@ -53,16 +55,14 @@ script: - uname -a - which -a vim - vim --cmd version --cmd quit - - vim --cmd "try | helptags doc/ | catch | cquit | endtry" --cmd quit - # - /tmp/vim-themis/bin/themis --runtimepath /tmp/vimproc --reporter dot - - /tmp/vim-themis/bin/themis --runtimepath /tmp/vimproc --exclude ConcurrentProcess --reporter dot - - ruby scripts/check-changelog.rb + - | + if [[ "${RUN_LINT}" != "true" ]]; then + /tmp/vim-themis/bin/themis --runtimepath /tmp/vimproc --exclude ConcurrentProcess --reporter dot + fi - if [[ "${RUN_LINT}" == "true" ]] ; then bash scripts/run-lint-on-ci.sh ; fi after_success: - - covimerage write_coverage $THEMIS_PROFILE - - coverage xml - - bash <(curl -s https://codecov.io/bash) + - bash scripts/coverage.sh notifications: webhooks: diff --git a/scripts/coverage.sh b/scripts/coverage.sh new file mode 100755 index 000000000..affde9fb4 --- /dev/null +++ b/scripts/coverage.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -ev + +if [[ "${THEMIS_PROFILE}" == "" ]]; then + exit +fi + +covimerage write_coverage $THEMIS_PROFILE +coverage xml +bash <(curl -s https://codecov.io/bash) diff --git a/scripts/install-vim.sh b/scripts/install-vim.sh index fd5d7f621..7ce98af7f 100755 --- a/scripts/install-vim.sh +++ b/scripts/install-vim.sh @@ -4,6 +4,9 @@ set -ev case "${TRAVIS_OS_NAME}" in linux) + if [[ "${VIM_VERSION}" == "" ]]; then + exit + fi git clone --depth 1 --branch "${VIM_VERSION}" https://github.com/vim/vim /tmp/vim cd /tmp/vim ./configure --prefix="${HOME}/vim" --with-features=huge \ diff --git a/scripts/run-lint-on-ci.sh b/scripts/run-lint-on-ci.sh index edbdeb646..e80d5db5c 100755 --- a/scripts/run-lint-on-ci.sh +++ b/scripts/run-lint-on-ci.sh @@ -34,3 +34,9 @@ go get -d -v ./scripts # Run reviewdog. reviewdog -reporter=github-pr-check + +# Check tag name conflicts +vim --cmd "try | helptags doc/ | catch | cquit | endtry" --cmd quit + +# Validate changelog +ruby scripts/check-changelog.rb