Skip to content

Commit

Permalink
auto merge prs from develop from master, close #2363
Browse files Browse the repository at this point in the history
  • Loading branch information
bahmutov committed Jan 8, 2020
1 parent 100e06e commit 6bb885e
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 16 deletions.
16 changes: 0 additions & 16 deletions .github/workflows/automerge-pr-develop-master.yml

This file was deleted.

5 changes: 5 additions & 0 deletions .github/workflows/create-pr-develop-to-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,9 @@ jobs:
if: github.event.pull_request.merged == true
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
# be explicit about branches
source_branch: "develop"
destination_branch: "master"
pr_title: "develop to master auto PR"
pr_body: ":robot: Automated PR from **develop** to **master**"
pr_label: "auto-pr"
15 changes: 15 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Mergify configuration file
# https://doc.mergify.io/configuration.html
pull_request_rules:
- name: automatic merge develop -> master
conditions:
# pull request is to master
- base=master
# pull request has label set by our create PR action
- label=auto-pr
# need to quote the condition to escape spaces
# https://doc.mergify.io/conditions.html#status-check-name
- "status-success=ci/circleci: docs-tests"
actions:
merge:
method: merge
2 changes: 2 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ You should push your local changes to your forked GitHub repository and then ope
- Please check the "Allow edits from maintainers" checkbox when submitting your PR. This will make it easier for the maintainers to make minor adjustments, to help with tests or any other changes we may need.
![Allow edits from maintainers checkbox](https://user-images.githubusercontent.com/1271181/31393427-b3105d44-ada9-11e7-80f2-0dac51e3919e.png)

Every pull request merged into `develop` automatically opens another pull request to `master`, which should be merged automatically using Mergify Bot after the CircleCI tests pass, see issue [#2363](https://github.com/cypress-io/cypress-documentation/issues/2363).

### Contributor License Agreement

We use a [`cla-assistant.io`](https://cla-assistant.io/) web hook to make sure every contributor assigns the rights of their contribution to Cypress.io. If you want to read the CLA agreement, its text is in this [gist](https://gist.github.com/bahmutov/cf22bc6c6b55219d0f9a76d04981f7ae).
Expand Down

0 comments on commit 6bb885e

Please sign in to comment.