mirror of
https://github.com/YosysHQ/yosys
synced 2025-06-09 23:53:26 +00:00
Merge pull request #461 from mithro/travis-rework
travis: Print branches before fetching, try both locations.
This commit is contained in:
commit
8dd59bd72e
1 changed files with 9 additions and 1 deletions
|
@ -29,8 +29,16 @@ fi
|
||||||
if [ z"$TRAVIS_BRANCH" != z ]; then
|
if [ z"$TRAVIS_BRANCH" != z ]; then
|
||||||
TRAVIS_COMMIT_ACTUAL=$(git log --pretty=format:'%H' -n 1)
|
TRAVIS_COMMIT_ACTUAL=$(git log --pretty=format:'%H' -n 1)
|
||||||
echo "- Fixing detached head (current $TRAVIS_COMMIT_ACTUAL -> $TRAVIS_COMMIT)"
|
echo "- Fixing detached head (current $TRAVIS_COMMIT_ACTUAL -> $TRAVIS_COMMIT)"
|
||||||
git fetch origin $TRAVIS_COMMIT
|
git remote -v
|
||||||
git branch -v
|
git branch -v
|
||||||
|
if [ x"$(git show-ref -s HEAD)" = x"$TRAVIS_COMMIT" ]; then
|
||||||
|
echo "Checked out at $TRAVIS_COMMIT"
|
||||||
|
else
|
||||||
|
if [ z"$TRAVIS_PULL_REQUEST_SLUG" != z ]; then
|
||||||
|
git fetch source $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from source"
|
||||||
|
fi
|
||||||
|
git fetch origin $TRAVIS_COMMIT || echo "Unable to fetch $TRAVIS_COMMIT from origin"
|
||||||
|
fi
|
||||||
git branch -D $TRAVIS_BRANCH || true
|
git branch -D $TRAVIS_BRANCH || true
|
||||||
git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH
|
git checkout $TRAVIS_COMMIT -b $TRAVIS_BRANCH
|
||||||
git branch -v
|
git branch -v
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue