Skip to content

Commit

Permalink
Merge remote-tracking branch 'DINAR/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
itpp-bot committed Apr 20, 2022
2 parents 2b3edb7 + c3c7e98 commit 6356e07
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
20 changes: 10 additions & 10 deletions static-files/15.0/.pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ repos:
- id: autoflake
args: ["-i", "--ignore-init-module-imports"]
- repo: https://github.com/psf/black
rev: 20.8b1
rev: 22.3.0
hooks:
- id: black
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.1.2
rev: v2.4.1
hooks:
- id: prettier
name: prettier + plugin-xml
Expand All @@ -34,15 +34,15 @@ repos:
args:
- --plugin=@prettier/plugin-xml
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v7.8.1
rev: v7.32.0
hooks:
- id: eslint
verbose: true
args:
- --color
- --fix
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.4.0
rev: v4.0.1
hooks:
- id: trailing-whitespace
# exclude autogenerated files
Expand All @@ -62,25 +62,25 @@ repos:
- id: mixed-line-ending
args: ["--fix=lf"]
- repo: https://github.com/PyCQA/pylint
rev: pylint-2.5.3
rev: v2.11.1
hooks:
- id: pylint
name: pylint with optional checks
args: ["--rcfile=.pylintrc", "--exit-zero"]
verbose: true
additional_dependencies: &pylint_deps
- pylint-odoo==3.5.0
- pylint-odoo==5.0.5
- id: pylint
name: pylint with mandatory checks
args: ["--rcfile=.pylintrc-mandatory"]
additional_dependencies: *pylint_deps
- repo: https://github.com/asottile/pyupgrade
rev: v1.26.2
rev: v2.29.0
hooks:
- id: pyupgrade
args: ["--keep-percent-format"]
- repo: https://github.com/acsone/setuptools-odoo
rev: 2.6.0
rev: 3.0.3
hooks:
- id: setuptools-odoo-make-default
- id: setuptools-odoo-get-requirements
Expand All @@ -90,7 +90,7 @@ repos:
- --header
- "# generated from manifests external_dependencies"
- repo: https://gitlab.com/PyCQA/flake8
rev: 3.8.3
rev: 3.9.2
hooks:
- id: flake8
name: flake8 except __init__.py
Expand All @@ -102,7 +102,7 @@ repos:
files: /__init__\.py$
additional_dependencies: ["flake8-bugbear==20.1.4"]
- repo: https://github.com/PyCQA/isort
rev: 5.5.1
rev: 5.9.3
hooks:
- id: isort
name: isort except __init__.py
Expand Down
2 changes: 1 addition & 1 deletion static-files/all/.github/workflows/DINAR.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ jobs:
password ${{ secrets.DINAR_TOKEN }}
EOF
- name: Build ${{ env.IMAGE_ODOO_BASE }}
uses: elgohr/Publish-Docker-Github-Action@master
uses: elgohr/Publish-Docker-Github-Action@v4
env:
LOCAL_CUSTOM_DIR: ./image
AGGREGATE: true
Expand Down

0 comments on commit 6356e07

Please sign in to comment.