From dee94cb4f6423fb2ec2550498691ac1d0b21ef0c Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 13 Jun 2017 10:41:00 +0300
Subject: [PATCH] - Added Bats to TravisCI, make runs parallel.
---
.pre-commit-config.yaml | 8 ++++----
.travis.yml | 43 ++++++++++++++++++++++++-----------------
2 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 827f946..05d44f9 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,5 +1,5 @@
- repo: https://github.com/pre-commit/pre-commit-hooks
- sha: v0.7.1
+ sha: v0.8.0
hooks:
- id: check-added-large-files
- id: check-merge-conflict
@@ -8,10 +8,10 @@
sha: v0.5.4
hooks:
- id: shell-lint
- files: &shellscripts 'merge-conflict'
+ files: &shellscripts '^merge-conflict$'
- id: shellcheck
files: *shellscripts
-- repo: ./
- sha: HEAD
+- repo: https://www.shore.co.il/git/git-pre-commit/
+ sha: master
hooks:
- id: merge-conflict
diff --git a/.travis.yml b/.travis.yml
index 3b4d008..8190b86 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
---
-language: python
-python: "3.6"
dist: trusty
sudo: false
group: beta
@@ -11,22 +9,31 @@ cache:
- $HOME/.cabal
- $HOME/.ghc
-addons:
- apt:
- packages:
- - cabal-install
- - ghc
-
-env:
- PATH: "$HOME/bats/bin:$HOME/.cabal/bin:$PATH"
-
-install:
- - cabal update && cabal install shellcheck
- - pip install pre_commit | cat
- - git clone --depth 1 https://github.com/sstephenson/bats.git "$HOME/bats"
-
-script:
- - pre-commit run --all-files
+matrix:
+ fast_finish: True
+ include:
+ - language: python
+ python: "3.6"
+ env:
+ PATH: "$HOME/.cabal/bin:$PATH"
+ addons:
+ apt:
+ packages:
+ - cabal-install
+ - ghc
+ install:
+ - cabal update && cabal install shellcheck
+ - pip install pre_commit | cat
+ - pre-commit install-hooks
+ script:
+ - pre-commit run --all-files
+ - language: shell
+ env:
+ PATH: "$HOME/bats/bin:$PATH"
+ install:
+ - git clone --depth 1 https://github.com/sstephenson/bats.git "$HOME/bats"
+ script:
+ bats -t tests/
notifications:
on_failure: never
--
GitLab