espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 21:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/ci_check_executable_windows' into 'master'

Browse Source 
ci: fix check_executables issue on Windows

See merge request espressif/esp-idf!13342
This commit is contained in:
Fu Hanxi
2021-04-27 07:14:59 +00:00
parent f975329429 7f2973f702
commit cba0725aac
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.pre-commit-config.yaml
View File

@@ -22,8 +22,6 @@ repos:
- id: end-of-file-fixer - id: end-of-file-fixer
exclude: *whitespace_excludes exclude: *whitespace_excludes
- id: check-executables-have-shebangs - id: check-executables-have-shebangs
- id: file-contents-sorter
files: '(tools\/ci\/executable-list\.txt|tools\/ci\/mypy_ignore_list\.txt)'
- id: mixed-line-ending - id: mixed-line-ending
args: ['-f=lf'] args: ['-f=lf']
- id: double-quote-string-fixer - id: double-quote-string-fixer
@@ -97,3 +95,8 @@ repos:
additional_dependencies: ['mypy==0.800', 'mypy-extensions==0.4.3'] additional_dependencies: ['mypy==0.800', 'mypy-extensions==0.4.3']
language: python language: python
types: [python] types: [python]
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
hooks:
- id: file-contents-sorter
files: '(tools\/ci\/executable-list\.txt|tools\/ci\/mypy_ignore_list\.txt)'

6
tools/ci/idf_ci_utils.py
View File

@@ -56,8 +56,8 @@ def _check_git_filemode(full_path): # type: (str) -> bool
mode = stdout.split(' ', 1)[0] # e.g. 100644 for a rw-r--r-- mode = stdout.split(' ', 1)[0] # e.g. 100644 for a rw-r--r--
if any([int(i, 8) & 1 for i in mode[-3:]]): if any([int(i, 8) & 1 for i in mode[-3:]]):
return False
return True return True
return False
def is_executable(full_path): # type: (str) -> bool def is_executable(full_path): # type: (str) -> bool
@@ -90,7 +90,7 @@ def get_git_files(path=IDF_PATH, full_path=False): # type: (str, bool) -> list[
# https://github.com/python/cpython/pull/6299/commits/bfd63120c18bd055defb338c075550f975e3bec1 # https://github.com/python/cpython/pull/6299/commits/bfd63120c18bd055defb338c075550f975e3bec1
# In order to solve python https://bugs.python.org/issue9584 # In order to solve python https://bugs.python.org/issue9584
# glob pattern does not support brace expansion issue # glob pattern does not support brace expansion issue
def _translate(pat): def _translate(pat): # type: (str) -> str
"""Translate a shell PATTERN to a regular expression. """Translate a shell PATTERN to a regular expression.
There is no way to quote meta-characters. There is no way to quote meta-characters.
""" """
@@ -179,7 +179,7 @@ def _translate(pat):
return res return res
def translate(pat): def translate(pat): # type: (str) -> str
res = _translate(pat) res = _translate(pat)
return r'(?s:%s)\Z' % res return r'(?s:%s)\Z' % res

1
tools/ci/mypy_ignore_list.txt
View File

@@ -171,7 +171,6 @@ tools/ci/checkout_project_ref.py
tools/ci/ci_fetch_submodule.py tools/ci/ci_fetch_submodule.py
tools/ci/deploy_docs.py tools/ci/deploy_docs.py
tools/ci/envsubst.py tools/ci/envsubst.py
tools/ci/idf_ci_utils.py
tools/ci/normalize_clangtidy_path.py tools/ci/normalize_clangtidy_path.py
tools/ci/python_packages/gitlab_api.py tools/ci/python_packages/gitlab_api.py
tools/ci/python_packages/idf_http_server_test/adder.py tools/ci/python_packages/idf_http_server_test/adder.py