Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
135
noc
Commits
fdb1a81b
Commit
fdb1a81b
authored
Aug 26, 2020
by
Dmitry Volodin
Browse files
Merge branch 'noc-lint-no-del' into 'master'
gitlab ci: Do not try to lint deleted files See merge request
noc/noc!4224
parents
683141d7
39be3922
Changes
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
fdb1a81b
...
...
@@ -14,7 +14,7 @@ check labels:
stage
:
Lint
image
:
registry.getnoc.com/infrastructure/noc-py-lint:master
script
:
-
FLIST=$(git --no-pager diff --name-only $(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA) $CI_COMMIT_SHA)
-
FLIST=$(git --no-pager diff
--diff-filter=d
--name-only $(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA) $CI_COMMIT_SHA)
-
python ./scripts/check-labels.py --junit-report=build/reports/labels-junit.xml $FLIST
only
:
-
merge_requests
...
...
@@ -32,7 +32,7 @@ flake8:
image
:
registry.getnoc.com/infrastructure/noc-py-lint:master
script
:
-
set -x
-
FLIST=$(git --no-pager diff --name-only $(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA) $CI_COMMIT_SHA | egrep ".py$" | grep -v ".docker/"||
true
)
-
FLIST=$(git --no-pager diff
--diff-filter=d
--name-only $(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA) $CI_COMMIT_SHA | egrep ".py$" | grep -v ".docker/"||
true
)
-
>
if [ ! -z "$FLIST" ];
then
...
...
@@ -141,7 +141,7 @@ pylint:
image
:
registry.getnoc.com/infrastructure/noc-py-lint:master
script
:
-
set -x
-
FLIST=$(git --no-pager diff --name-only $(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA) $CI_COMMIT_SHA | egrep ".py$" | grep -v ".docker/"||
true
)
-
FLIST=$(git --no-pager diff
--diff-filter=d
--name-only $(git merge-base origin/$CI_MERGE_REQUEST_TARGET_BRANCH_NAME $CI_COMMIT_SHA) $CI_COMMIT_SHA | egrep ".py$" | grep -v ".docker/"||
true
)
-
>
if [ ! -z "$FLIST" ];
then
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment