Skip to content

Commit

Permalink
Merge pull request #114 from move4mobile/develop
Browse files Browse the repository at this point in the history
Next release
  • Loading branch information
mschilling authored Feb 12, 2021
2 parents f2a6f93 + 7eb30a7 commit f21aa8e
Show file tree
Hide file tree
Showing 5 changed files with 2,959 additions and 3,280 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: automerge
uses: "pascalgn/automerge-action@135f0bdb927d9807b5446f7ca9ecc2c51de03c4a"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: "automerge,!work in progress"
MERGE_DELETE_BRANCH: "true"
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,11 @@ https://guides.github.com/features/mastering-markdown/

#### cards-jekyll-template
https://github.com/willianjusten/cards-jekyll-template


## GitHub Actions
### Auto merge PR's

Experiment 1:
* https://github.com/pascalgn/automerge-action

Loading

0 comments on commit f21aa8e

Please sign in to comment.