From 574cd9612d7520e273c0cd2153554f4da1bf6fff Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 17 Nov 2020 15:13:37 +0100 Subject: [PATCH 1/4] StockFish: comment out duplicate RepoType --- srclibs/StockFish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srclibs/StockFish.yml b/srclibs/StockFish.yml index 6e86b31d9a..7c1eba5961 100644 --- a/srclibs/StockFish.yml +++ b/srclibs/StockFish.yml @@ -1,4 +1,4 @@ -RepoType: git-svn +#RepoType: git-svn #Repo:https://cuckoochess.googlecode.com/svn/trunk/ #Subdir:DroidFish/jni/stockfish RepoType: git From 8e4de1e5f2fa0c20e6e2a78af8869ecf4bf8095d Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 17 Nov 2020 15:16:07 +0100 Subject: [PATCH 2/4] srclibs: add new line character at the end of files missing it --- srclibs/MinetestGame.yml | 2 +- srclibs/MozFennec.yml | 2 +- srclibs/MozFennecBeta.yml | 2 +- srclibs/MozGlean.yml | 3 ++- srclibs/StockFish.yml | 1 + srclibs/realm.yml | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/srclibs/MinetestGame.yml b/srclibs/MinetestGame.yml index b804fccdce..7e5a14fb29 100644 --- a/srclibs/MinetestGame.yml +++ b/srclibs/MinetestGame.yml @@ -1,2 +1,2 @@ RepoType: git -Repo: https://github.com/minetest/minetest_game.git \ No newline at end of file +Repo: https://github.com/minetest/minetest_game.git diff --git a/srclibs/MozFennec.yml b/srclibs/MozFennec.yml index 23ca06a538..d3c4e11377 100644 --- a/srclibs/MozFennec.yml +++ b/srclibs/MozFennec.yml @@ -1,2 +1,2 @@ RepoType: hg -Repo: https://hg.mozilla.org/releases/mozilla-release/ \ No newline at end of file +Repo: https://hg.mozilla.org/releases/mozilla-release/ diff --git a/srclibs/MozFennecBeta.yml b/srclibs/MozFennecBeta.yml index a1c2ba700e..e1e1c1c526 100644 --- a/srclibs/MozFennecBeta.yml +++ b/srclibs/MozFennecBeta.yml @@ -1,2 +1,2 @@ RepoType: hg -Repo: https://hg.mozilla.org/releases/mozilla-beta/ \ No newline at end of file +Repo: https://hg.mozilla.org/releases/mozilla-beta/ diff --git a/srclibs/MozGlean.yml b/srclibs/MozGlean.yml index 857e54280c..8352ee64fb 100644 --- a/srclibs/MozGlean.yml +++ b/srclibs/MozGlean.yml @@ -1,2 +1,3 @@ RepoType: git -Repo: https://github.com/mozilla/glean.git \ No newline at end of file +Repo: https://github.com/mozilla/glean.git + diff --git a/srclibs/StockFish.yml b/srclibs/StockFish.yml index 7c1eba5961..f31ab76278 100644 --- a/srclibs/StockFish.yml +++ b/srclibs/StockFish.yml @@ -3,3 +3,4 @@ #Subdir:DroidFish/jni/stockfish RepoType: git Repo: https://github.com/official-stockfish/Stockfish + diff --git a/srclibs/realm.yml b/srclibs/realm.yml index bc0d80cd68..bb5c463105 100644 --- a/srclibs/realm.yml +++ b/srclibs/realm.yml @@ -3,4 +3,4 @@ Repo: https://github.com/realm/realm-js.git Prepare: | - git submodule update --init \ No newline at end of file + git submodule update --init From e3a48e6dfd820342ea929eb5e1efadd5ec250757 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 17 Nov 2020 15:23:33 +0100 Subject: [PATCH 3/4] use cleaner working dir selection in check scripts --- tools/check-localized-metadata.py | 2 +- tools/check-metadata-summary-whitespace.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/check-localized-metadata.py b/tools/check-localized-metadata.py index e64d767cdf..6b8e0a6f78 100755 --- a/tools/check-localized-metadata.py +++ b/tools/check-localized-metadata.py @@ -5,7 +5,7 @@ import os import re import sys -os.chdir(os.path.dirname(__file__) + '/../') +os.chdir(os.path.join(os.path.dirname(__file__), '..')) count = 0 diff --git a/tools/check-metadata-summary-whitespace.py b/tools/check-metadata-summary-whitespace.py index eff38a42eb..8bb9f23764 100755 --- a/tools/check-metadata-summary-whitespace.py +++ b/tools/check-metadata-summary-whitespace.py @@ -3,7 +3,7 @@ import glob import os -os.chdir(os.path.dirname(__file__) + '/../') +os.chdir(os.path.join(os.path.dirname(__file__), '..')) for f in glob.glob('metadata/*/*/*.txt') + glob.glob('metadata/*/*/*/*.txt'): if os.path.getsize(f) == 0: From 2346b1565b075e06032d75b8fd2be9622e01904f Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 17 Nov 2020 15:23:04 +0100 Subject: [PATCH 4/4] gitlab-ci: check all .yml files with yamllint fdroidserver!721 --- .gitlab-ci.yml | 5 +++-- .yamllint | 28 ++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 .yamllint diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 89732a9ccb..4ceb350762 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ lint: - schedules - pipelines before_script: - - printf "Package\x3a androguard fdroidserver python3-asn1crypto python3-ruamel.yaml\nPin\x3a release a=stretch-backports\nPin-Priority\x3a 500\n" > /etc/apt/preferences.d/debian-stretch-backports.pref + - printf "Package\x3a androguard fdroidserver python3-asn1crypto python3-ruamel.yaml yamllint\nPin\x3a release a=stretch-backports\nPin-Priority\x3a 500\n" > /etc/apt/preferences.d/debian-stretch-backports.pref - echo "deb http://deb.debian.org/debian/ stretch-backports main" > /etc/apt/sources.list.d/backports.list - apt-get update - apt-get -qy dist-upgrade @@ -33,7 +33,8 @@ lint: fi; done; set -x; - apt-get install python3-colorama; + apt-get install python3-colorama yamllint; + for f in $files; do [[ $f == *'.yml' ]] && yamllint "$f"; done; ./tools/check-git-repo-availability.py $files; ./tools/audit-gradle.py $CHANGED; set +x; diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000000..a200904905 --- /dev/null +++ b/.yamllint @@ -0,0 +1,28 @@ +extends: default + +rules: + braces: + level: warning + max-spaces-inside: 1 + brackets: + level: warning + max-spaces-inside: 1 + colons: + level: warning + commas: + level: warning + comments: disable + comments-indentation: disable + document-start: disable + empty-lines: disable + hyphens: + level: warning + indentation: + level: warning + indent-sequences: consistent + line-length: disable + new-line-at-end-of-file: + level: warning + trailing-spaces: + level: warning + truthy: disable