Fixed the Auto PR Script

.travis.yml

@@ -95,7 +95,12 @@ jobs:
         - git diff --stat --exit-code .travis.yml
 
     - stage: Deploy
-      script: ./generate-stackbrew-pr.sh
+      script:
+        - |
+          if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then
+            TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA"
+          fi
+        - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE"
 
     # Docker Build #
 

generate-stackbrew-pr.sh

@@ -3,15 +3,16 @@
 set -e
 . functions.sh
 
-if [ -z "${1}" ]; then
+COMMIT_RANGE="${1}"
-  COMMIT_ID="${TRAVIS_COMMIT}"
+COMMIT_ID="$(git show -s --format="%H" "${COMMIT_RANGE}" | head -n 1)"
+
+if [ ! -z "$TRAVIS" ]; then
   COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE}"
   BRANCH_NAME="travis-${TRAVIS_BUILD_ID}"
-  GITHUB_USERNAME="nodejs-github-bot"
+  GITHUB_USERNAME="${AUTOPR_GITHUB_USERNAME:-nodejs-github-bot}"
 else
-  COMMIT_ID="${1}"
   COMMIT_MESSAGE="$(git show -s --format=%B "${COMMIT_ID}")"
-  BRANCH_NAME="travis-$(date +%s)"
+  BRANCH_NAME="autopr-$(date +%s)"
   if [[ "$(git remote get-url origin)" =~ github.com/([^/]*)/docker-node.git ]]; then
     GITHUB_USERNAME="${BASH_REMATCH[1]}"
   fi
@@ -27,8 +28,8 @@ fi
 IMAGES_FILE="library/node"
 REPO_NAME="official-images"
 ORIGIN_SLUG="${GITHUB_USERNAME}/${REPO_NAME}"
-UPSTREAM_SLUG="docker-library/${REPO_NAME}"
+UPSTREAM_SLUG="${AUTOPR_UPSTREAM:-docker-library}/${REPO_NAME}"
-DOCKER_SLUG="nodejs/docker-node"
+DOCKER_SLUG="${TRAVIS_REPO_SLUG:-nodejs/docker-node}"
 gitpath="../${REPO_NAME}"
 
 function auth_header() {
@@ -57,10 +58,11 @@ function permission_check() {
 }
 
 function setup_git_author() {
-  GIT_AUTHOR_NAME="$(git show -s --format="%aN" "${COMMIT_ID}")"
+  # Set Git User Info
-  GIT_AUTHOR_EMAIL="$(git show -s --format="%aE" "${COMMIT_ID}")"
+  GIT_AUTHOR_NAME="Node.js GitHub Bot"
-  GIT_COMMITTER_NAME="$(git show -s --format="%cN" "${COMMIT_ID}")"
+  GIT_AUTHOR_EMAIL="gh_bot@nodejs.org"
-  GIT_COMMITTER_EMAIL="$(git show -s --format="%cN" "${COMMIT_ID}")"
+  GIT_COMMITTER_NAME="Node.js GitHub Bot"
+  GIT_COMMITTER_EMAIL="gh_bot@nodejs.org"
 
   export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL
 }
@@ -71,12 +73,21 @@ function message() {
 
 function pr_payload() {
   local escaped_message
+  local body
+
   escaped_message="$(echo "${COMMIT_MESSAGE}" | sed -E -e "s/\"/\\\\\"/g")"
+
+  if [ ! -z "${PR_NUMBER}" ]; then
+    body="Pull Request: ${DOCKER_SLUG}#${PR_NUMBER}"
+  else
+    body="Commit: https://github.com/${DOCKER_SLUG}/compare/${COMMIT_RANGE}"
+  fi
+
   echo "{
-    'title': 'Node: ${escaped_message}',
+    \"title\": \"Node: ${escaped_message}\",
-    'body': 'Commit: nodejs/docker-node@${COMMIT_ID}',
+    \"body\" : \"${body}\",
-    'head': '${GITHUB_USERNAME}:${BRANCH_NAME}',
+    \"head\" : \"${GITHUB_USERNAME}:${BRANCH_NAME}\",
-    'base': 'master'
+    \"base\": \"master\"
   }"
 }
 
@@ -84,16 +95,16 @@ function comment_payload() {
   local pr_url
   pr_url="${1}"
   echo "{
-    'body': 'Created PR to the ${REPO_NAME} repo (${pr_url})'
+    \"body\": \"Created PR to the ${REPO_NAME} repo (${pr_url})\"
   }"
 }
 
-if images_updated "${COMMIT_ID}"; then
+if images_updated "${COMMIT_RANGE}"; then
 
   permission_check
 
   # Set Git User Info
-  setup_git_author
+  [ -z "$(git config user.name)" ] && [ -z "$GIT_AUTHOR_NAME" ] && setup_git_author
 
   info "Cloning..."
   git clone --depth 50 "https://github.com/${UPSTREAM_SLUG}.git" ${gitpath} 2> /dev/null
@@ -108,7 +119,8 @@ if images_updated "${COMMIT_ID}"; then
   git commit -m "$(message)"
 
   info "Pushing..."
-  git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" 2> /dev/null || fatal "Error pushing the updated stackbrew"
+  git fetch --unshallow "https://github.com/${ORIGIN_SLUG}.git"
+  git push "https://${GITHUB_API_TOKEN}:x-oauth-basic@github.com/${ORIGIN_SLUG}.git" -f "${BRANCH_NAME}" || fatal "Error pushing the updated stackbrew"
 
   cd - && rm -rf ${gitpath}
 

travis.yml.template

@@ -93,6 +93,11 @@ jobs:
         - git diff --stat --exit-code .travis.yml
 
     - stage: Deploy
-      script: ./generate-stackbrew-pr.sh
+      script:
+        - |
+          if [ "false" != "$TRAVIS_PULL_REQUEST" ]; then
+            TRAVIS_COMMIT_RANGE="$TRAVIS_BRANCH..$TRAVIS_PULL_REQUEST_SHA"
+          fi
+        - ./generate-stackbrew-pr.sh "$TRAVIS_COMMIT_RANGE"
 
     # Docker Build #