Skip to content

update latest Python in CI to 3.10 / use all available threads for pylint #3493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 2 commits into from
Oct 11, 2021
Merged

update latest Python in CI to 3.10 / use all available threads for pylint #3493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d06ac4
updated latest Python in CI to 3.10
firewave Oct 9, 2021
e092aa2
scriptcheck.yml: use all available threads for pylint
firewave Oct 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/CI-unixish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Python 3.9
- name: Set up Python 3.10
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: '3.10'

- name: Cache uncrustify
uses: actions/cache@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/CI-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Set up Python 3.9
- name: Set up Python 3.10
if: matrix.qt_ver == ''
uses: actions/setup-python@v2
with:
python-version: 3.9
python-version: '3.10'

- name: Setup msbuild.exe
if: matrix.qt_ver == ''
Expand Down
17 changes: 7 additions & 10 deletions .github/workflows/scriptcheck.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9]
python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, '3.10']
fail-fast: false

steps:
Expand Down Expand Up @@ -48,25 +48,22 @@ jobs:
python -m pip install psutil

- name: run Shellcheck
if: matrix.python-version == '3.9'
if: matrix.python-version == '3.10'
run: |
find . -name "*.sh" | xargs shellcheck --exclude SC2002,SC2013,SC2034,SC2035,SC2043,SC2046,SC2086,SC2089,SC2090,SC2129,SC2211,SC2231

- name: run pylint
if: matrix.python-version == '3.9'
if: matrix.python-version == '3.10'
run: |
pylint --rcfile=pylintrc_travis addons/*.py
pylint --rcfile=pylintrc_travis htmlreport/cppcheck-htmlreport
pylint --rcfile=pylintrc_travis htmlreport/*.py
pylint --rcfile=pylintrc_travis tools/*.py
pylint --rcfile=pylintrc_travis --jobs $(nproc) addons/*.py htmlreport/cppcheck-htmlreport htmlreport/*.py tools/*.py

- name: check .json files
if: matrix.python-version == '3.9'
if: matrix.python-version == '3.10'
run: |
find . -name '*.json' | xargs -n 1 python -m json.tool > /dev/null

- name: Validate
if: matrix.python-version == '3.9'
if: matrix.python-version == '3.10'
run: |
make -j$(nproc) validateCFG validatePlatforms validateRules

Expand Down Expand Up @@ -103,7 +100,7 @@ jobs:
./check.sh

- name: dmake
if: matrix.python-version == '3.9'
if: matrix.python-version == '3.10'
run: |
make -j$(nproc) run-dmake
git diff --exit-code
Expand Down