Skip to content

fix in logic for detecting PR #36

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

Closed
wants to merge 2 commits into from
Closed

fix in logic for detecting PR #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
141dcd5
fix in logic for detecting PR
stevector Sep 8, 2017
2caf272
Update set-up-globals.sh
stevector Sep 8, 2017
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
4 changes: 2 additions & 2 deletions .circleci/set-up-globals.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ echo 'export BRANCH=$(echo $CIRCLE_BRANCH | grep -v '"'"'^\(master\|[0-9]\+.x\)$
echo 'export PR_ENV=${BRANCH:+pr-$BRANCH}' >> $BASH_ENV
echo 'export CIRCLE_ENV=ci-$CIRCLE_BUILD_NUM' >> $BASH_ENV
# If we are on a pull request
if [[ $CIRCLE_BRANCH != "master" && -n ${CIRCLE_PULL_REQUEST+x} ]]
if [[ ${CIRCLE_BRANCH} != "master" && ! -z ${CIRCLE_PULL_REQUEST} ]]
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I thought this line was the problem, but now I think we just have a race condition: #34 (comment)

then
# Then use a pr- branch/multidev
PR_NUMBER=${CIRCLE_PULL_REQUEST##*/}
Expand Down Expand Up @@ -95,4 +95,4 @@ echo "StrictHostKeyChecking no" >> "$HOME/.ssh/config"
git config --global user.email "$GIT_EMAIL"
git config --global user.name "Circle CI"
# Ignore file permissions.
git config --global core.fileMode false
git config --global core.fileMode false