瀏覽代碼

.gitlab-ci.yml: simplify (and fix) check-DEVELOPERS

The check-DEVELOPERS test would always fail, because && will return
the exit code of the left-hand side if not 0, so it *always* returns
1.

But in fact, the test can be simplified quite a lot: we can run
getdeveloper directly, without arguments. That should just print
'No action specified', but it will also print any syntax errors it
encountered. So we can just 'grep -v' the expected output away; if
there is anything more, grep will return 0, but if there is nothing
more, it will return 1. So we just need to invert the result.

Incidentally, this also fixes the incorrect remaining reference to
support/scripts.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Arnout Vandecappelle 8 年之前
父節點
當前提交
91a5ec960b
共有 2 個文件被更改,包括 2 次插入6 次删除
  1. 1 3
      .gitlab-ci.yml
  2. 1 3
      .gitlab-ci.yml.in

+ 1 - 3
.gitlab-ci.yml

@@ -36,9 +36,7 @@ check-gitlab-ci.yml:
 
 check-DEVELOPERS:
     script:
-        - PYTHONPATH=$PWD/support/scripts
-                python -c 'from getdeveloperlib import parse_developers; parse_developers()' |
-                grep . && exit 1
+        - ! utils/get-developers | grep -v 'No action specified'
 
 .defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to

+ 1 - 3
.gitlab-ci.yml.in

@@ -36,9 +36,7 @@ check-gitlab-ci.yml:
 
 check-DEVELOPERS:
     script:
-        - PYTHONPATH=$PWD/support/scripts
-                python -c 'from getdeveloperlib import parse_developers; parse_developers()' |
-                grep . && exit 1
+        - ! utils/get-developers | grep -v 'No action specified'
 
 .defconfig: &defconfig
     # Running the defconfigs for every push is too much, so limit to