Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[10.1] [PR 724] Add note when the script breakes #730

Merged
merged 1 commit into from Mar 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions modules/developer_manual/examples/scripts/backport.sh
Expand Up @@ -59,17 +59,19 @@ else
pullTitle=$(curl https://api.github.com/repos/$repository/pulls/$pullId 2>/dev/null | jq '.title' | sed 's/^.//' | sed 's/.$//')
fi

# build names used
targetCommit="$targetBranch-$commit-$pullId"
message="[$targetBranch] [PR $pullId] $pullTitle"

echo
echo "Info:"
echo "You have $rateLimitRemaining backport requests remaining in the current github rate limit window"
echo "The current rate limit window resets in $remaining"
echo
echo "Backporting commit $commit to $targetBranch"
echo
echo "Backporting commit $commit to $targetBranch with the following text:"
echo "$message"

# build names used
targetCommit=$targetBranch-$commit-$pullId
message="[$targetBranch] [PR $pullId] $pullTitle"
echo

set -e

Expand Down
3 changes: 3 additions & 0 deletions modules/developer_manual/pages/general/backporting.adoc
Expand Up @@ -56,6 +56,9 @@ limit allows for up to 60 requests per hour. Unauthenticated requests are
associated with the originating IP address, and not the user making requests.
For more information see https://developer.github.com/v3/#rate-limiting

NOTE: In case of conflicts, the script exits. The merge conflicts will need
to be resolved before manually continuing the backport.

[source,console]
----
include::examples/scripts/backport.sh
Expand Down