chore(build): revert presubmit-queue-setup.sh; fix git login in publish-build-artifacts.sh

This commit is contained in:
Yegor Jbanov
2015-11-16 18:14:14 -08:00
parent ac38812809
commit dd1e212402
2 changed files with 17 additions and 12 deletions

View File

@ -1,22 +1,21 @@
#!/bin/bash
set -e -x -o pipefail
set -e -o pipefail
if [ "$TRAVIS_REPO_SLUG" = "angular/angular" ]; then
if [[ $TRAVIS_BRANCH == "presubmit-"* || $MODE == "build_only" ]]; then
if [[ $TRAVIS_BRANCH == "presubmit-"* ]]; then
echo '*********************'
echo '** PRESUBMIT SETUP **'
echo '*********************'
git config credential.helper "store --file=.git/credentials"
# travis encrypt GITHUB_TOKEN_ANGULAR=??? --repo=angular/angular
echo "https://${GITHUB_TOKEN_ANGULAR}:@github.com" > .git/credentials
git config user.name "`git --no-pager show -s --format='%cN' HEAD`"
git config user.email "`git --no-pager show -s --format='%cE' HEAD`"
if [[ $TRAVIS_BRANCH == "presubmit-"* ]]; then
echo '*********************'
echo '** PRESUBMIT SETUP **'
echo '*********************'
git remote add upstream https://github.com/angular/angular.git
git fetch upstream master
git rebase upstream/master
fi
git remote add upstream https://github.com/angular/angular.git
git fetch upstream master
git rebase upstream/master
fi
fi
fi