Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ci-scripts/ci-runner.bash
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,8 @@ if [ $CI_GENERIC -eq 1 ]; then
elif [ $CI_TUTORIAL -eq 1 ]; then
# Run tutorial checks
# Find modified or added tutorial checks
tutorialchecks=( $(git log --name-status --oneline --no-merges -1 | \
awk '/^[AM]/ { print $2 } /^R0[0-9][0-9]/ { print $3 }' | \
grep -e '^tutorial/(?!config/).*\.py') )
tutorialchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are you using three dots here instead of two. If there's no difference, I prefer ...

Copy link
Contributor Author

@teojgo teojgo Jul 11, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The three dots are different from two. The ... checks diversion from the latest common point while the .. checks without taking the common point into account. Thus, ... is better because there could be a change in the master in the meanwhile.That was one of the problems we had in the production where .. was initially used.

grep -e '^tutorial/(?!config/).*\.py') )

if [ ${#tutorialchecks[@]} -ne 0 ]; then
tutorialchecks_path=""
Expand Down Expand Up @@ -196,8 +195,7 @@ else


# Find modified or added user checks
userchecks=( $(git log --name-status --oneline --no-merges -1 | \
awk '/^[AM]/ { print $2 } /^R0[0-9][0-9]/ { print $3 }' | \
userchecks=( $(git diff origin/master...HEAD --name-only --oneline --no-merges | \
grep -e '^cscs-checks/.*\.py') )

if [ ${#userchecks[@]} -ne 0 ]; then
Expand Down