From 46b56b61120e92c436ffbb8a84ea77850f4ebb3a Mon Sep 17 00:00:00 2001 From: oca-git-bot Date: Thu, 21 Oct 2021 18:04:05 +0200 Subject: [PATCH] [IMP] update dotfiles [ci skip] --- .copier-answers.yml | 3 ++- .github/workflows/pre-commit.yml | 4 ++++ .github/workflows/stale.yml.rej | 9 +++++++++ .pre-commit-config.yaml | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/stale.yml.rej diff --git a/.copier-answers.yml b/.copier-answers.yml index b0645c857..626d0809d 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,6 +1,7 @@ # Do NOT update manually; changes here will be overwritten by Copier -_commit: v1.2.1 +_commit: v1.3.4 _src_path: gh:oca/oca-addons-repo-template +ci: Travis dependency_installation_mode: PIP generate_requirements_txt: true include_wkhtmltopdf: false diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 335381cb7..282a1fa70 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -10,4 +10,8 @@ jobs: steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 + with: + # The pylint-odoo version we use here does not support python 3.10 + # https://github.com/OCA/oca-addons-repo-template/issues/80 + python-version: "3.9" - uses: pre-commit/action@v2.0.0 diff --git a/.github/workflows/stale.yml.rej b/.github/workflows/stale.yml.rej new file mode 100644 index 000000000..f41569091 --- /dev/null +++ b/.github/workflows/stale.yml.rej @@ -0,0 +1,9 @@ +diff a/.github/workflows/stale.yml b/.github/workflows/stale.yml (rejected hunks) +@@ -15,2 +15,3 @@ jobs: + # General settings. ++ ascending: true + remove-stale-when-updated: true +@@ -52,2 +53,3 @@ jobs: + repo-token: ${{ secrets.GITHUB_TOKEN }} ++ ascending: true + only-labels: "needs more information" diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ff0d7a8b6..91be4d15d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -5,7 +5,7 @@ exclude: | # Files and folders generated by bots, to avoid loops ^setup/|/static/description/index\.html$| # We don't want to mess with tool-generated files - .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$| + .svg$|/tests/([^/]+/)?cassettes/|^.copier-answers.yml$|^.github/| # Maybe reactivate this when all README files include prettier ignore tags? ^README\.md$| # Library files can have extraneous formatting (even minimized)