diff options
| author | Fedja Beader <fedja@protonmail.ch> | 2025-02-10 21:03:17 +0000 |
|---|---|---|
| committer | Fedja Beader <fedja@protonmail.ch> | 2025-02-10 21:03:17 +0000 |
| commit | 98f7cf6e5893ecf5ab224194cee5f671253f8d1d (patch) | |
| tree | 05a0222fde90884146da95b00ad96e69149a462d | |
| parent | 81207f0ee92593b70047585fa1d609dc6a862e98 (diff) | |
| download | manaplus-98f7cf6e5893ecf5ab224194cee5f671253f8d1d.tar.gz manaplus-98f7cf6e5893ecf5ab224194cee5f671253f8d1d.tar.bz2 manaplus-98f7cf6e5893ecf5ab224194cee5f671253f8d1d.tar.xz manaplus-98f7cf6e5893ecf5ab224194cee5f671253f8d1d.zip | |
Upgrade cpplint to latest release
+Update CI job from Debian Buster to Bullseye. Buster's Py3.7 is too old for cpplint.
Squashed with:
* Update linters job to debian bullseye
* Force use of python3
* Try upgrade to python3. Other scripts will probably break.
****
mana/plus!124
| -rw-r--r-- | .gitlab-ci.yml | 4 | ||||
| -rwxr-xr-x | tools/ci/jobs/cpplint.sh | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 54e521a3d..ba69c6545 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -354,7 +354,7 @@ gcc-8_unittestsbin: linters: stage: lint - image: debian:buster + image: debian:bullseye script: - ./tools/ci/jobs/mplint.sh src po data - ./tools/ci/jobs/pngcheck.sh @@ -364,7 +364,7 @@ linters: <<: *job-push variables: MPLINT_PACKAGE_URL: "$CI_API_V4_URL/projects/mana%2Fmplint/jobs/artifacts/master/download?job=package_debian10_buster" - PACKAGES: git grep imagemagick pngcheck python unzip wget + PACKAGES: git grep imagemagick pngcheck python2 python3 unzip wget tags: - docker diff --git a/tools/ci/jobs/cpplint.sh b/tools/ci/jobs/cpplint.sh index 8bf769457..c8e709fbe 100755 --- a/tools/ci/jobs/cpplint.sh +++ b/tools/ci/jobs/cpplint.sh @@ -11,8 +11,11 @@ if [[ ! -x cpplint.py \ || $(find cpplint.py -mtime 1 -print) ]]; then #tools/ci/scripts/retry.sh wget "https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py" # Google no longer offers their cpplint and suggests using the following one, instead: - tools/ci/scripts/retry.sh wget "https://raw.githubusercontent.com/cpplint/cpplint/refs/tags/1.6.1/cpplint.py" + tools/ci/scripts/retry.sh wget "https://raw.githubusercontent.com/cpplint/cpplint/refs/tags/2.0.0/cpplint.py" chmod +x cpplint.py + + # env python -> env python3 + sed -i -s -e '1s/python$/python3/' cpplint.py fi declare -a args |