Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
MNT: Updated the feedstock for conda-smithy version 1.5.2.
- Loading branch information
1 parent
366be21
commit ea57cf0
Showing
7 changed files
with
97 additions
and
176 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
#!/bin/bash | ||
|
||
|
||
# Update PR refs for testing. | ||
if [[ -n "${CIRCLE_PR_NUMBER}" ]] | ||
then | ||
FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/head:pr/${CIRCLE_PR_NUMBER}/head" | ||
FETCH_REFS="${FETCH_REFS} +refs/pull/${CIRCLE_PR_NUMBER}/merge:pr/${CIRCLE_PR_NUMBER}/merge" | ||
fi | ||
|
||
# Retrieve the refs. | ||
if [[ -n "${CIRCLE_PR_NUMBER}" ]] | ||
then | ||
git fetch -u origin ${FETCH_REFS} | ||
fi | ||
|
||
# Checkout the PR merge ref. | ||
if [[ -n "${CIRCLE_PR_NUMBER}" ]] | ||
then | ||
git checkout -qf "pr/${CIRCLE_PR_NUMBER}/merge" | ||
fi | ||
|
||
# Check for merge conflicts. | ||
if [[ -n "${CIRCLE_PR_NUMBER}" ]] | ||
then | ||
git branch --merged | grep "pr/${CIRCLE_PR_NUMBER}/head" > /dev/null | ||
fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.