Skip to content

Commit

Permalink
Merge branch 'release/0.3.0'
Browse files Browse the repository at this point in the history
* release/0.3.0:
  Apply Infopen Ansible role template 0.40.0
  Apply Infopen Ansible role template 0.38.0
  Update molecule from 3.0.4 to 3.0.5
  • Loading branch information
achaussier committed Jul 12, 2020
2 parents 661ef81 + 6be10a3 commit 862d1b4
Show file tree
Hide file tree
Showing 6 changed files with 171 additions and 3 deletions.
28 changes: 28 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
---
name: Bug Report
about: Report an error or abnormal run
labels: bug
---

### Community Note

* Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request
* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request
* If you are interested in working on this issue or have submitted a pull request, please leave a comment

<!--- Please, keep this note for the community --->

### Run Output


### Expected Behavior

<!--- What should have happened? --->

### Actual Behavior

<!--- What actually happened? --->

### Steps to Reproduce

<!--- Please list the steps required to reproduce the issue. --->
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
blank_issues_enabled: true
contact_links: []
25 changes: 25 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Feature Request
about: Think about a new feature
labels: enhancement
---

### Community Note

* Please vote on this issue by adding a 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to the original issue to help the community and maintainers prioritize this request
* Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request
* If you are interested in working on this issue or have submitted a pull request, please leave a comment

<!--- Please, keep this note for the community --->

### Description

<!--- Describe your feature request here. --->

### References

<!---
Information about referencing Github Issues: https://help.github.com/articles/basic-writing-and-formatting-syntax/#referencing-issues-and-pull-requests
--->

* #0000
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,11 @@ name: CI

on:
pull_request: null
push: null
push:
branches-ignore:
- 'pyup-update*'
tags:
- '*'

jobs:
tests:
Expand Down
111 changes: 110 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,120 @@
---

pull_request_rules:
- name: 'Ensure all pull requests use the "develop" base branch'
conditions:
- 'base!=develop'
actions:
comment:
message: |
Hi,
You've select an invalid base branch, we only authorize "develop".
Please fix it, thanks.
label:
add:
- 'invalid'
remove:
- 'ready to merge'
- name: 'Assign all pull requests to achaussier'
conditions:
- '#assignee=0'
actions:
assign:
users:
- 'achaussier'
- name: 'Remove label "ready to merge" in case of CI errors'
conditions:
- 'status-failure~=.*'
actions:
label:
remove:
- 'ready to merge'
- name: 'Remove label "ready to merge" if pull request is closed'
conditions:
- 'closed'
actions:
label:
remove:
- 'invalid'
- 'ready to merge'
- name: 'Remove label "ready to merge" if pull request is a draft'
conditions:
- 'draft'
actions:
label:
remove:
- 'ready to merge'
- name: 'Remove label "conflict" if no conflict'
conditions:
- '-conflict'
actions:
label:
remove:
- 'conflict'
- name: 'Add label "conflict" if a conflict is detected'
conditions:
- 'conflict'
actions:
label:
add:
- 'conflict'
remove:
- 'ready to merge'
- name: 'Remove label "ready to merge" once pull request is merged'
conditions:
- 'merged'
actions:
label:
remove:
- 'ready to merge'
- name: 'Add label "ready to merge" if CI is OK'
conditions:
- 'base=develop'
- '-draft'
- 'status-success=pyup.io/safety-ci'
- 'status-success=tests (3.6, 2.8)'
- 'status-success=tests (3.6, 2.9)'
- 'status-success=tests (3.7, 2.8)'
- 'status-success=tests (3.7, 2.9)'
- 'status-success=tests (3.8, 2.8)'
- 'status-success=tests (3.8, 2.9)'
- '-status-failure=pyup.io/safety-ci'
- '-status-failure=tests (3.6, 2.8)'
- '-status-failure=tests (3.6, 2.9)'
- '-status-failure=tests (3.7, 2.8)'
- '-status-failure=tests (3.7, 2.9)'
- '-status-failure=tests (3.8, 2.8)'
- '-status-failure=tests (3.8, 2.9)'
actions:
label:
add:
- 'ready to merge'
- name: 'Add label "dependencies" on PyUP pull requests'
conditions:
- 'author=pyup-bot'
actions:
label:
add:
- 'dependencies'
- name: 'Automatic merge PyUP updates on CI success'
conditions:
- 'author=pyup-bot'
- 'base=develop'
- 'status-success=tests'
- 'status-success=pyup.io/safety-ci'
- 'status-success=tests (3.6, 2.8)'
- 'status-success=tests (3.6, 2.9)'
- 'status-success=tests (3.7, 2.8)'
- 'status-success=tests (3.7, 2.9)'
- 'status-success=tests (3.8, 2.8)'
- 'status-success=tests (3.8, 2.9)'
- '-status-failure=pyup.io/safety-ci'
- '-status-failure=tests (3.6, 2.8)'
- '-status-failure=tests (3.6, 2.9)'
- '-status-failure=tests (3.7, 2.8)'
- '-status-failure=tests (3.7, 2.9)'
- '-status-failure=tests (3.8, 2.8)'
- '-status-failure=tests (3.8, 2.9)'
actions:
delete_head_branch: {}
merge:
method: 'merge'
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ansible-lint==4.2.0
docker==4.2.2
flake8==3.8.3
molecule==3.0.4
molecule==3.0.5
pytest==5.4.3
testinfra==5.2.1
tox==3.16.1

0 comments on commit 862d1b4

Please # to comment.