From e064fdd488e2cae3eecc70a1203338e547319f32 Mon Sep 17 00:00:00 2001 From: Brian DeSimone Date: Tue, 16 Nov 2021 09:06:30 -0600 Subject: [PATCH 1/5] build perspective merge branch uses custom commit message on the merge commit. --- src/commands/build-prospective-branch.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/commands/build-prospective-branch.yml b/src/commands/build-prospective-branch.yml index 4b1319b..ad1914f 100644 --- a/src/commands/build-prospective-branch.yml +++ b/src/commands/build-prospective-branch.yml @@ -17,7 +17,9 @@ steps: set +e git config --global user.email "$GITHUB_EMAIL" git config --global user.name "$GITHUB_USERNAME" - git fetch && git merge "origin/$GITHUB_PR_BASE_BRANCH" --no-edit + # Merge the branch with no commit and then create a custom commit message contianing the original commit message. + git fetch && git merge "origin/$GITHUB_PR_BASE_BRANCH" --no-commit + git commit -am "Merging ${GITHUB_PR_BASE_BRANCH} into ${CIRCLE_BRANCH}. ${GITHUB_PR_COMMIT_MESSAGE}" if [[ $? -ne 0 && << parameters.force >> == false ]]; then echo "Failed to merge $GITHUB_PR_BASE_BRANCH into $CIRCLE_BRANCH" exit 1 From 416b5c91f3c47ab57981b76a9cb534d18bdff9c6 Mon Sep 17 00:00:00 2001 From: Brian DeSimone Date: Tue, 16 Nov 2021 09:11:38 -0600 Subject: [PATCH 2/5] update version to allow for pr testing --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 058f632..c06cc6f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 orbs: # dev version needs to be manually deployed to accurately test commit changes. # Once deployed, update to reflect the version deployed. - ghpr: narrativescience/ghpr@dev:alpha + ghpr: narrativescience/ghpr@dev:1.1.2 commands: pack-validate: From d236c4eb266b5cdbe7ebbb8b063d465012ebc1d1 Mon Sep 17 00:00:00 2001 From: Brian DeSimone Date: Tue, 16 Nov 2021 09:15:52 -0600 Subject: [PATCH 3/5] proper dev version --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c06cc6f..745ecc6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 orbs: # dev version needs to be manually deployed to accurately test commit changes. # Once deployed, update to reflect the version deployed. - ghpr: narrativescience/ghpr@dev:1.1.2 + ghpr: narrativescience/ghpr@dev:1.1.3 commands: pack-validate: From 6a7e77ad964230b5627ef776a7ad434116319dfb Mon Sep 17 00:00:00 2001 From: Brian DeSimone Date: Tue, 16 Nov 2021 09:17:36 -0600 Subject: [PATCH 4/5] force merge in pr tests since no one really updates master on this repo --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 745ecc6..15db716 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,7 @@ jobs: machine: true steps: - ghpr/build-prospective-branch + force: true - ghpr/slack-pr-author: message: ":tada: Tests passed!" get_slack_user_by: meseeks From 58811f88617a66252d935d84bc671e1616ed040c Mon Sep 17 00:00:00 2001 From: Brian DeSimone Date: Tue, 16 Nov 2021 09:17:56 -0600 Subject: [PATCH 5/5] proper syntax --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 15db716..7f25a11 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,7 @@ jobs: test: machine: true steps: - - ghpr/build-prospective-branch + - ghpr/build-prospective-branch: force: true - ghpr/slack-pr-author: message: ":tada: Tests passed!"