Skip to content

Commit

Permalink
Allow commits to master
Browse files Browse the repository at this point in the history
This will fix CI when being run in master.

See https://github.com/Tecnativa/docker-socket-proxy/runs/1529426822.
  • Loading branch information
Jairo Llopis authored and yajo committed Dec 11, 2020
1 parent e84babd commit baea7ee
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 31 deletions.
5 changes: 2 additions & 3 deletions .copier-answers.autopretty.yml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
push:
branches:
- main
- master

jobs:
Expand Down
53 changes: 25 additions & 28 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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

0 comments on commit baea7ee

Please sign in to comment.