Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use consistent local branch name for WPT sync.

Browse source
This commit is contained in:
Josh Matthews 2019-03-27 10:14:28 -04:00 • committed by GitHub
parent 0cb87cca13
commit 296f848f2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
etc/ci/update-wpt-checkout
View file

@ -11,7 +11,8 @@ set -o pipefail
REMOTE_NAME=sync-fork REMOTE_NAME=sync-fork
LOG_FILE=test-wpt.log LOG_FILE=test-wpt.log
CURRENT_DATE=$(date +"%d-%m-%Y") CURRENT_DATE=$(date +"%d-%m-%Y")
BRANCH_NAME="wpt_update_${CURRENT_DATE}" BRANCH_NAME="wpt_update"
REMOTE_BRANCH_NAME="wpt_update_${CURRENT_DATE}"
export GIT_AUTHOR_NAME="WPT Sync Bot" export GIT_AUTHOR_NAME="WPT Sync Bot"
export GIT_AUTHOR_EMAIL="josh+wptsync@joshmatthews.net" export GIT_AUTHOR_EMAIL="josh+wptsync@joshmatthews.net"
@ -94,7 +95,7 @@ function unsafe_open_pull_request() {
AUTH="${WPT_SYNC_USER}:${WPT_SYNC_TOKEN}" AUTH="${WPT_SYNC_USER}:${WPT_SYNC_TOKEN}"
UPSTREAM="https://${AUTH}@github.com/${WPT_SYNC_USER}/servo.git" UPSTREAM="https://${AUTH}@github.com/${WPT_SYNC_USER}/servo.git"
git remote add "${REMOTE_NAME}" "${UPSTREAM}" || return 2 git remote add "${REMOTE_NAME}" "${UPSTREAM}" || return 2
git push -f "${REMOTE_NAME}" "${BRANCH_NAME}" &>/dev/null || return 3 git push -f "${REMOTE_NAME}" "${BRANCH_NAME}:${REMOTE_BRANCH_NAME}" &>/dev/null || return 3
# Prepare the pull request metadata. # Prepare the pull request metadata.
BODY="Automated downstream sync of changes from upstream as of " BODY="Automated downstream sync of changes from upstream as of "
@ -103,7 +104,7 @@ function unsafe_open_pull_request() {
cat <<EOF >prdata.json || return 4 cat <<EOF >prdata.json || return 4
{ {
"title": "Sync WPT with upstream (${CURRENT_DATE})", "title": "Sync WPT with upstream (${CURRENT_DATE})",
"head": "${WPT_SYNC_USER}:${BRANCH_NAME}", "head": "${WPT_SYNC_USER}:${REMOTE_BRANCH_NAME}",
"base": "master", "base": "master",
"body": "${BODY}", "body": "${BODY}",
"maintainer_can_modify": true "maintainer_can_modify": true