From c4daf6cdd3d60bc1774ff0b36b34cce17cc023b5 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Mon, 29 May 2017 21:32:16 +0300
Subject: [PATCH] - Use newer shell pre-commit hooks. - Use shellcheck from
cabal (not the older version in Ubuntu's package repo which doesn't support
--external-sources).
---
.pre-commit-config.yaml | 2 +-
.travis.yml | 14 ++++++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7259e7c..8569f91 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,7 +4,7 @@
- id: check-added-large-files
- id: check-merge-conflict
- repo: https://www.shore.co.il/git/shell-pre-commit/
- sha: v0.4.0
+ sha: v0.5.4
hooks:
- id: shell-lint
files: bundle_certs
diff --git a/.travis.yml b/.travis.yml
index 08f8e1c..7b519b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,23 +8,29 @@ 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:
- mawk
- openssl
- curl
- build-essential
- - 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