diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml index ed3317929..7b4798d01 100644 --- a/.github/workflows/CI-unixish.yml +++ b/.github/workflows/CI-unixish.yml @@ -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 diff --git a/.github/workflows/CI-windows.yml b/.github/workflows/CI-windows.yml index 7f0e7b725..ae3425019 100644 --- a/.github/workflows/CI-windows.yml +++ b/.github/workflows/CI-windows.yml @@ -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 == '' diff --git a/.github/workflows/scriptcheck.yml b/.github/workflows/scriptcheck.yml index 5e1ab6df7..9bb5dec87 100644 --- a/.github/workflows/scriptcheck.yml +++ b/.github/workflows/scriptcheck.yml @@ -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: @@ -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 @@ -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