Skip to content

ci: Make raven tests work on release branches #1596

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 1 commit into from
Oct 1, 2018
Merged

ci: Make raven tests work on release branches #1596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 9 additions & 4 deletions scripts/detect-raven.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
#!/bin/bash
set -e
set -eu

echo ""
echo "RAVEN: $RAVEN"

# Does any of the commits in a PR contain "[force ci]" string?
COMMITS=$(git --no-pager log master.. --no-merges --format=%s)
# Find the latest commit that is present in master and the branch we test
MASTER_TMP=master-latest-tmp
git fetch origin master:${MASTER_TMP}
MERGE_BASE=$(git merge-base ${MASTER_TMP} ${TRAVIS_BRANCH:-master})

# Does any of the new commits contain "[force ci]" string?
COMMITS=$(git --no-pager log ${MERGE_BASE}.. --no-merges --format=%s)
if [[ -n "$(grep '\[force ci\]' <<< "$COMMITS")" ]]; then
HAS_FORCE_COMMIT=true
else
Expand All @@ -16,7 +21,7 @@ fi
echo "HAS_FORCE_COMMIT: $HAS_FORCE_COMMIT"

# Does any changed file lives in raven-js/raven-node directory?
CHANGES=$(git --no-pager diff --name-only master)
CHANGES=$(git --no-pager diff --name-only ${MERGE_BASE})
if [[ -n "$(grep "$RAVEN" <<< "$CHANGES")" ]]; then
HAS_CHANGES=true
else
Expand Down