这是indexloc提供的服务，不要输入任何密码
Skip to content

update ciignore to take circleci compare url #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jul 18, 2018
Merged

update ciignore to take circleci compare url #158

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f3aafd3
add ciignore
shahidhk Jul 17, 2018
5602eda
remove verbose logging
shahidhk Jul 17, 2018
19c8e98
update the script
shahidhk Jul 17, 2018
2355d7f
update script
shahidhk Jul 18, 2018
c1d192c
Merge remote-tracking branch 'upstream/master' into ciignore
shahidhk Jul 18, 2018
101d178
update log line
shahidhk Jul 18, 2018
9d18e44
add attribution
shahidhk Jul 18, 2018
11dcdea
update script to check compare url also
shahidhk Jul 18, 2018
37a15dd
Merge remote-tracking branch 'upstream/master' into ciignore
shahidhk Jul 18, 2018
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
15 changes: 13 additions & 2 deletions .circleci/ciignore.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,20 @@ if [[ ! -a "$ROOT/.ciignore" ]]; then
exit # If .ciignore doesn't exists, just quit this script
fi

changes="$(git diff-tree --no-commit-id --name-only -r origin/master..HEAD)"
# If branch is master, diff with origin/master will always be empty. Depend on
# CIRCLE_COMPARE_URL first and if its not set, check for diff with master.
if [[ ! -z "$CIRCLE_COMPARE_URL" ]]; then
# CIRCLE_COMPARE_URL is not empty, use it to get the diff
COMMIT_RANGE=$(echo $CIRCLE_COMPARE_URL | sed 's:^.*/compare/::g')
echo "Diff: $COMMIT_RANGE"
changes="$(git diff $COMMIT_RANGE --name-only)"
else
# CIRCLE_COMPARE_URL is not set, diff with origin/master
echo "Diff: origin/master..HEAD"
changes="$(git diff-tree --no-commit-id --name-only -r origin/master..HEAD)"
fi

echo "CHANGES FROM ORIGIN/MASTER:"
echo "Changes in this build:"
echo $changes
echo

Expand Down