Skip to content

Commit

Permalink
Merge pull request #1313 from petr-muller/comments
Browse files Browse the repository at this point in the history
Ignore comments in config-ordering checks
  • Loading branch information
openshift-merge-robot authored Aug 30, 2018
2 parents d90db8a + 08e4e19 commit fa71f77
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ presubmits:
decorate: true
name: pull-ci-origin-installer-e2e-aws
rerun_command: /test e2e-aws
# The abomination below is equivalent to `^((?!Documentation).)*$`. Since
# Go doesn't support negative lookaheads, we are stuck with the following.
run_if_changed: ^([^D]|D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*([^Do]|o[^Dc]|oc[^Du]|ocu[^Dm]|ocum([^De]|e([^Dn]|n([^Dt]|t([^Da]|a[^Dt]|at[^Di]|ati[^Do]|atio[^Dn]))))))*(D(D|oD|ocD|ocuD|ocum(D|e(D|n(D|t(D|aD|atD|atiD|atioD)))))*(o|oc|ocu|ocum(e(n(t(a|at|ati|atio)?)?)?)?)?)?$
skip_cloning: true
spec:
Expand Down
2 changes: 1 addition & 1 deletion hack/validate-prow-job-ordering.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ cp -r "${jobs_dir}" "${workdir}"

"$( dirname "${BASH_SOURCE[0]}" )/order-prow-job-config.sh"

if ! diff -Naupr "${workdir}/jobs" "${jobs_dir}"> "${workdir}/diff"; then
if ! diff -Naupr -I '^[[:space:]]*#.*' "${workdir}/jobs" "${jobs_dir}"> "${workdir}/diff"; then
cat << EOF
[ERROR] This check enforces Prow Job configuration YAML file format (ordering,
[ERROR] linebreaks, indentation) to be consistent over the whole repository. We have
Expand Down

0 comments on commit fa71f77

Please sign in to comment.