brooklyn-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From geomacy <>
Subject [GitHub] brooklyn-dist pull request #74: PR merge automation
Date Fri, 06 Jan 2017 09:43:32 GMT
Github user geomacy commented on a diff in the pull request:
    --- Diff: scripts/am ---
    @@ -0,0 +1,97 @@
    +# Licensed to the Apache Software Foundation (ASF) under one
    +# or more contributor license agreements.  See the NOTICE file
    +# distributed with this work for additional information
    +# regarding copyright ownership.  The ASF licenses this file
    +# to you under the Apache License, Version 2.0 (the
    +# "License"); you may not use this file except in compliance
    +# with the License.  You may obtain a copy of the License at
    +# Unless required by applicable law or agreed to in writing,
    +# software distributed under the License is distributed on an
    +# KIND, either express or implied.  See the License for the
    +# specific language governing permissions and limitations
    +# under the License.
    +# Always use on a separate merge-only repo!
    +# Best used with a wrapper script in your PATH
    +# #!/bin/bash
    +# export USERNAME=<github username>
    +# export PERSONAL_TOKEN=<github personal token from>
    +# <absolute path to brooklyn-dist>/scripts/am $@
    +set -e
    +: ${PR_REMOTE:=upstream}
    +: ${APACHE_REMOTE:=apache}
    +: ${CLOSES_MESSAGE:="Closes #"}
    +REMOTE_URL=$(git remote get-url ${APACHE_REMOTE})
    +if [ -z "$PR" ]; then
    +    echo "Usage: am <PR number>"
    +    exit 1
    +if ! git branch | grep -q "* master"; then
    +    echo "Must be on master branch"
    +    exit 1
    --- End diff --
    Maybe worth adding an `else` with 
    git fetch --all
    git pull --rebase
    so as to automate that step too.

If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at or file a JIRA ticket
with INFRA.

View raw message