Add --commit to automated-commits to make local testing easier
ClosedPublic
Actions

Authored by jasonbcox on Feb 12 2020, 00:34.

Details

Reviewers

Fabien

Group Reviewers

Restricted Project

Commits

rSTAGING6af55e8d098f: Add --commit to automated-commits to make local testing easier
rABC6af55e8d098f: Add --commit to automated-commits to make local testing easier

Summary

Local testing of automated-commits can be made difficult because it currently
assumes building on top of origin/master. The best example of this is working on a stack
of changes locally, where the top of the stack is a change to automated-commits itself
that depends on commits not yet landed on master.

This patch fixes that by enabling the selection of a commit to build on top of other than
latest master.

Test Plan

arc patch D5270

git checkout master
git checkout -b testbranch
git cherry-pick arcpatch-D5270  # only take the changes from the D5270 patch, not its parent (this patch)
COMMIT_TYPE=update-chainparams ./automated-commits.sh  # fails

git checkout arcpatch-D5270
./automated-commits.sh -h
COMMIT_TYPE=update-chainparams ./automated-commits.sh --parent HEAD  # succeeds
DRY_RUN=no COMMIT_TYPE=update-chainparams ./automated-commits.sh --parent HEAD  # fails

Diff Detail

Repository

rABC Bitcoin ABC

Branch

local-autocommit

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 9486
Build 16885: Default Diff Build & Tests
Build 16884: arc lint + arc unit

Event Timeline

jasonbcox created this revision.Feb 12 2020, 00:34

Herald added a reviewer: Restricted Project. · View Herald TranscriptFeb 12 2020, 00:34

Build Bitcoin-ABC / Diffs / Diff Testing started.

jasonbcox added a child revision: D5270: Make all automated commits run smoke tests prior to pushing.Feb 12 2020, 00:38

jasonbcox edited the test plan for this revision. (Show Details)Feb 12 2020, 00:39

Build Bitcoin-ABC / Diffs / Diff Testing passed.

Harbormaster completed remote builds in B9450: Diff 16309.Feb 12 2020, 00:51

You should probably forbid to push (no dry run) if commit is not origin/master.

contrib/source-control-tools/automated-commits.sh
42 ↗	(On Diff #16309)	`shift` after `exit` ?
48 ↗	(On Diff #16309)	You should `exit` here.

This revision now requires changes to proceed.Feb 13 2020, 09:54

Fixes according to feedback
Small refactor so error messages will appear early
Rename --commit to --parent since this is more self explanatory. Associated variable names changed as well.