From a10f24ff5eb83bcb00b1f81c1352900771a2be32 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Thu, 3 Mar 2022 20:49:59 +0200
Subject: [PATCH] Update pre-commit hooks.
Use the git skeleton file. Apply changes from the new hooks.
---
.gitlab-ci.yml | 3 ++-
.pre-commit-config.yaml | 55 +++++++++++++++++++++++------------------
2 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d72c48..dea9057 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,8 @@ build:
tags: ["$CI_COMMIT_BRANCH.shore.co.il"]
rules:
# yamllint disable-line rule:line-length
- - if: &if $CI_COMMIT_BRANCH == "host01" || $CI_COMMIT_BRANCH == "ns4" || $CI_COMMIT_BRANCH == "kodi"
+ - if: &if $CI_COMMIT_BRANCH == "host01" || $CI_COMMIT_BRANCH == "ns4" || $CI_COMMIT_BRANCH
+ == "kodi"
pull:
extends: .compose-pull
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9ed17e4..bf25394 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,54 +4,61 @@ repos:
rev: v4.0.1
hooks:
- id: check-added-large-files
- - id: check-executables-have-shebangs
+ - id: check-json
- id: check-merge-conflict
- id: check-symlinks
- id: check-xml
+ - id: detect-private-key
+ - id: end-of-file-fixer
- id: trailing-whitespace
+ exclude: \.diff$
- - repo: https://github.com/Yelp/detect-secrets
- rev: v1.1.0
+ - repo: https://github.com/codespell-project/codespell.git
+ rev: v2.1.0
hooks:
- - id: detect-secrets
+ - id: codespell
- - repo: https://github.com/adrienverge/yamllint
- rev: v1.26.3
+ - repo: https://github.com/Yelp/detect-secrets.git
+ rev: v1.1.0
hooks:
- - id: yamllint
+ - id: detect-secrets
- - repo: https://github.com/amperser/proselint/
+ - repo: https://github.com/amperser/proselint.git
rev: 0.10.2
hooks:
- id: proselint
types: [plain-text]
exclude: LICENSE
+ - repo: https://gitlab.com/devopshq/gitlab-ci-linter.git
+ rev: v1.0.2
+ hooks:
+ - id: gitlab-ci-linter
+ args:
+ - "--server"
+ - https://git.shore.co.il
+
+ - repo: https://git.shore.co.il/nimrod/yamltool.git
+ rev: v0.1.2
+ hooks:
+ - id: yamltool
+
+ - repo: https://github.com/adrienverge/yamllint.git
+ rev: v1.26.3
+ hooks:
+ - id: yamllint
+
- repo: https://github.com/executablebooks/mdformat.git
rev: 0.7.10
hooks:
- id: mdformat
- - repo: https://github.com/shellcheck-py/shellcheck-py.git
- rev: v0.7.2.1
- hooks:
- - id: shellcheck
-
- - repo: https://git.shore.co.il/nimrod/pre-commit-hooks.git/
+ - repo: https://git.shore.co.il/nimrod/pre-commit-hooks.git
rev: v0.2.0
hooks:
- - id: shell-validate
- id: docker-compose
- - repo: https://gitlab.com/devopshq/gitlab-ci-linter
- rev: v1.0.4
- hooks:
- - id: gitlab-ci-linter
- args:
- - "--server"
- - https://git.shore.co.il
-
- repo: https://github.com/AleksaC/hadolint-py.git
- rev: v2.1.0
+ rev: v2.8.0
hooks:
- id: hadolint
--
GitLab