From 7f5cc24ac8e0debc00173e00861fa1b63e0ada01 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 29 May 2017 21:28:15 +0300
Subject: [PATCH] - Use newer version of shell pre-commit hooks. - Use
shellcheck from cabal instead from the Ubuntu package repo (which has a newer
version that supports --external-sources).
---
.pre-commit-config.yaml | 2 +-
.travis.yml | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 57a1ef6..3ff2e35 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -6,7 +6,7 @@
- id: check-yaml
- id: check-merge-conflict
- repo: https://www.shore.co.il/git/shell-pre-commit/
- sha: v0.5.3
+ sha: v0.5.4
hooks:
- id: shell-lint
files: shell-lint
diff --git a/.travis.yml b/.travis.yml
index 911a70a..cf07a3c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,24 +3,30 @@ language: python
python: "3.5"
dist: trusty
sudo: false
-
+group: beta
cache:
- pip
- directories:
- $HOME/.pre-commit
+ - $HOME/.cabal
+ - $HOME/.ghc
addons:
apt:
- sources:
- - sourceline: 'deb http://archive.ubuntu.com/ubuntu trusty-backports main universe multiverse'
packages:
- - shellcheck
+ - cabal-install
+ - ghc
+
+env:
+ PATH: $PATH:$HOME/.cabal/bin
install:
- - pip install pre_commit
+ - cabal update && cabal install shellcheck
+ - pip install pre_commit | cat
script:
- pre-commit run --all-files
notifications:
+ on_failure: never
email: false
--
GitLab