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

Fallback #120

Merged
merged 9 commits into from
May 25, 2017
Merged

Fallback #120

merged 9 commits into from
May 25, 2017

Conversation

jonpepler
Copy link
Contributor

@jonpepler jonpepler commented May 24, 2017

This has become a little more ominous than the original intention, which was to revert the most recent PR if no PR has been approved in the last 24 hours. I found that this was not something that could be done via the API, and so I propose a new consequence for inaction:

If no PR has been approved in the last 24 hours, Chaos randomly chooses a PR with no conflicts, and merges it in spite of the current vote.

The main purpose of this is to encourage progress (I'm afraid of the result of this PR myself), and of course introduce some chaos. This PR ensures that there will always be a discussion to be had.

Extra bonus: this PR includes a little class for handling commit objects, might come in handy for others.

@MINIMAN10000
Copy link
Contributor

I mean it fits the name chaos. But the thought of adding a commit revert wind up clock makes me uncomfortable.

However I am interested in the idea of being able to revert a commit via api

@jonpepler
Copy link
Contributor Author

jonpepler commented May 24, 2017

@MINIMAN10000 I can't say I'd ever want it to happen myself, but I like the idea of the threat being there 😛

@jonpepler
Copy link
Contributor Author

(updated description & title)

@jonpepler jonpepler changed the title Fallback (WIP) Fallback May 24, 2017
if(len(data) > 0)
# return previous commit sha if it exists
if(len(data) >= 1)
data[0]['last_commit_sha'] =
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a mistake

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Quite right, thanks for spotting that. I thought I'd removed it.

@chaosbot
Copy link
Collaborator

🙆‍♀️ PR passed with a vote of 7 for and 3 against, with a weighted total of 4.0 and a threshold of 3.6.

See merge-commit bffbc96 for more details.

@chaosbot chaosbot merged commit bffbc96 into Chaosthebot:master May 25, 2017
chaosbot added a commit that referenced this pull request May 25, 2017
chaosbot added a commit that referenced this pull request May 25, 2017
chaosbot added a commit that referenced this pull request May 25, 2017
This reverts commit bffbc96, reversing
changes made to bce8922.

did a couple of hotfixes, but too many problems.  eg, merge_pr_message_only has
unresolved names, and would take some manual refactoring to get to work
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants