From baea7eefadda2c10adf5ff7f7d5861e40e9fdebb Mon Sep 17 00:00:00 2001
From: Jairo Llopis <jairo.llopis@tecnativa.com>
Date: Thu, 10 Dec 2020 10:11:16 +0000
Subject: [PATCH] Allow commits to master
This will fix CI when being run in master.
See https://github.com/Tecnativa/docker-socket-proxy/runs/1529426822.
---
.copier-answers.autopretty.yml | 5 ++-
.github/workflows/pre-commit.yml | 1 +
.pre-commit-config.yaml | 53 +++++++++++++++-----------------
3 files changed, 28 insertions(+), 31 deletions(-)
diff --git a/.copier-answers.autopretty.yml b/.copier-answers.autopretty.yml
index 938184a..9e54e3e 100644
--- a/.copier-answers.autopretty.yml
+++ b/.copier-answers.autopretty.yml
@@ -1,10 +1,9 @@
# Changes here will be overwritten by Copier; do NOT edit manually
-_commit: v0.1.0a5
+_commit: v0.1.0a6
_src_path: https://github.com/copier-org/autopretty.git
ansible: false
biggest_kbs: 0
github: true
js: false
-protected_branches:
- - master
+protected_branches: []
python: true
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 1479882..2078fcb 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -4,6 +4,7 @@ on:
pull_request:
push:
branches:
+ - main
- master
jobs:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index adaa439..4a04d73 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,34 +10,6 @@ repos:
entry: found forbidden files; remove them
language: fail
files: "\\.rej$"
- - repo: https://github.com/pre-commit/pre-commit-hooks
- rev: v3.2.0
- hooks:
- - id: check-case-conflict
- - id: check-executables-have-shebangs
- - id: check-json
- - id: check-merge-conflict
- - id: check-symlinks
- - id: check-toml
- - id: check-xml
- - id: check-yaml
- - id: detect-private-key
- - id: end-of-file-fixer
- - id: mixed-line-ending
- args:
- - --fix=lf
- - id: no-commit-to-branch
- args:
- - --branch=master
- - id: trailing-whitespace
- - id: check-ast
- - id: check-builtin-literals
- - id: check-docstring-first
- - id: debug-statements
- - id: fix-encoding-pragma
- args:
- - --remove
- - id: requirements-txt-fixer
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.1.2
hooks:
@@ -87,3 +59,28 @@ repos:
# ignore unused imports in __init__.py
- --extend-ignore=F401
files: /__init__\.py$
+ - repo: https://github.com/pre-commit/pre-commit-hooks
+ rev: v3.2.0
+ hooks:
+ - id: check-case-conflict
+ - id: check-executables-have-shebangs
+ - id: check-json
+ - id: check-merge-conflict
+ - id: check-symlinks
+ - id: check-toml
+ - id: check-xml
+ - id: check-yaml
+ - id: detect-private-key
+ - id: end-of-file-fixer
+ - id: mixed-line-ending
+ args:
+ - --fix=lf
+ - id: trailing-whitespace
+ - id: check-ast
+ - id: check-builtin-literals
+ - id: check-docstring-first
+ - id: debug-statements
+ - id: fix-encoding-pragma
+ args:
+ - --remove
+ - id: requirements-txt-fixer
--
GitLab