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.

Sign up for GitHub

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

Smarter rebase on-top of github target logic #3617

Merged
merged 2 commits into from
Jul 12, 2018
Merged

Smarter rebase on-top of github target logic #3617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9908dd
Utilize github API to determine target PR branch
msheiny Jun 29, 2018
01b9031
Ignore shellcheck quote error in rebase script
msheiny Jun 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ jobs:
- run: apt-get install -y make
- checkout
- run:
name: Rebase on-top of latest develop
command: ./devops/scripts/rebase-develop.sh
name: Rebase on-top of github target
command: ./devops/scripts/rebase-ci.sh
- setup_remote_docker

- run: TAG=${CIRCLE_SHA1} make ci-lint-image
Expand All @@ -27,8 +27,8 @@ jobs:
- run: apt-get install -y make
- checkout
- run:
name: Rebase on-top of latest develop
command: ./devops/scripts/rebase-develop.sh
name: Rebase on-top of github target
command: ./devops/scripts/rebase-ci.sh
- setup_remote_docker

- restore_cache:
Expand Down Expand Up @@ -133,8 +133,8 @@ jobs:
- checkout

- run:
name: Rebase on-top of latest develop
command: ./devops/scripts/rebase-develop.sh
name: Rebase on-top of github target
command: ./devops/scripts/rebase-ci.sh

- run:
name: Installation apt pre-reqs
Expand Down
15 changes: 13 additions & 2 deletions devops/scripts/rebase-develop.sh → devops/scripts/rebase-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#!/bin/bash
# shellcheck disable=SC2086
#
# To be utilized in CircleCI
# Determine target branch from PR number and rebase against that

set -e

GITHUB_PR_URL="https://api.github.com/repos/freedomofpress/securedrop/pulls/${CIRCLE_PULL_REQUEST##*/}"

# If current branch is not master or doesnt start with release...
if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != release* ]]; then

Expand All @@ -12,9 +18,14 @@ if [[ "$CIRCLE_BRANCH" != "master" && "$CIRCLE_BRANCH" != release* ]]; then
# Ensure presensce of upstream remote
git ls-remote --exit-code --quiet upstream 2>/dev/null || git remote add upstream https://github.com/freedomofpress/securedrop.git

# Determine target branch via API
#
# (We are togglin' between two upstream containers here - the constant is both have python3)
target_branch="$(curl -s ${GITHUB_PR_URL} | python3 -c 'import sys, json; print(json.load(sys.stdin)["base"]["ref"])')"

# Fetch and rebase onto the latest in develop
git fetch upstream develop
git rebase upstream/develop
git fetch upstream "${target_branch}"
git rebase "upstream/${target_branch}"

# Print out the current head for debugging potential CI issues
git rev-parse HEAD
Expand Down