honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/ci/presubmit-queue-setup.sh
View File

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

6
scripts/ci/publish-build-artifacts.sh
View File

@ -14,6 +14,8 @@ REPO_URL="https://github.com/angular/angular.git"
SHA=`git rev-parse HEAD` SHA=`git rev-parse HEAD`
SHORT_SHA=`git rev-parse --short HEAD` SHORT_SHA=`git rev-parse --short HEAD`
COMMIT_MSG=`git log --oneline | head -n1` COMMIT_MSG=`git log --oneline | head -n1`
COMMITTER_USER_NAME=`git --no-pager show -s --format='%cN' HEAD`
COMMITTER_USER_EMAIL=`git --no-pager show -s --format='%cE' HEAD`
function publishRepo { function publishRepo {
LANG=$1 LANG=$1
@ -47,6 +49,10 @@ function publishRepo {
cd $REPO_DIR && \ cd $REPO_DIR && \
git add --all && \ git add --all && \
git commit -m "${COMMIT_MSG}" && \ git commit -m "${COMMIT_MSG}" && \
git config credential.helper "store --file=.git/credentials" && \
echo "https://${GITHUB_TOKEN_ANGULAR}:@github.com" > .git/credentials && \
git config user.name "${COMMITTER_USER_NAME}" && \
git config user.email "${COMMITTER_USER_EMAIL}" && \
git push origin $BUILD_BRANCH && \ git push origin $BUILD_BRANCH && \
git tag "2.0.0-build.${SHORT_SHA}.${LANG}" && \ git tag "2.0.0-build.${SHORT_SHA}.${LANG}" && \
git push origin --tags git push origin --tags