Skip to content

Commit

Permalink
scriptcheck.yml: removed unused Python 2.7 leftovers
Browse files Browse the repository at this point in the history
  • Loading branch information
firewave committed May 1, 2024
1 parent 033e9b3 commit f624737
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions .github/workflows/scriptcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ permissions:
jobs:
build:

# 'ubuntu-22.04' removes Python 2.7, 3.6 and 3.6 so keep the previous LTS version
# 'ubuntu-22.04' removes Python 3.5 and 3.6 so keep the previous LTS version
runs-on: ubuntu-20.04

steps:
Expand All @@ -43,8 +43,7 @@ jobs:
scriptcheck:

needs: build
# 'ubuntu-22.04' removes Python 2.7, 3.5 and 3.6 so keep the previous LTS version
# 'ubutunu-20.04' no longer works on 2.7 - TODO: re-added in a different way or remove support for it?
# 'ubuntu-22.04' removes Python 3.5 and 3.6 so keep the previous LTS version
runs-on: ubuntu-20.04
strategy:
matrix:
Expand Down Expand Up @@ -75,16 +74,7 @@ jobs:
sudo apt-get update
sudo apt-get install tidy libxml2-utils
- name: Install missing software on ubuntu (Python 2)
if: matrix.python-version == '2.7'
run: |
python -m pip install pip --upgrade
python -m pip install pathlib
python -m pip install pytest
python -m pip install pygments
- name: Install missing software on ubuntu (Python 3)
if: matrix.python-version != '2.7'
run: |
# shellcheck cannot be installed via pip
# ERROR: Could not find a version that satisfies the requirement shellcheck (from versions: none)
Expand Down Expand Up @@ -124,7 +114,6 @@ jobs:
make -j$(nproc) validateCFG validatePlatforms validateRules
- name: check python syntax
if: matrix.python-version != '2.7'
run: |
python -m py_compile addons/*.py
python -m py_compile htmlreport/cppcheck-htmlreport
Expand Down Expand Up @@ -167,14 +156,12 @@ jobs:
PYTHONPATH: ./tools

- name: test donate_cpu_lib
if: matrix.python-version != '2.7'
run: |
python -m pytest -Werror --strict-markers -vv tools/donate_cpu_lib_test.py
env:
PYTHONPATH: ./tools

- name: test donate_cpu_server
if: matrix.python-version != '2.7'
run: |
python -m pytest -Werror --strict-markers -vv tools/donate_cpu_server_test.py
env:
Expand Down

0 comments on commit f624737

Please sign in to comment.