Skip to content

Commit d96f431

Browse files
achaussierachaussier
committed
Merge branch 'release/0.4.0'
* release/0.4.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
2 parents f2c99e5 + f708663 commit d96f431

File tree

6 files changed

+171
-3
lines changed

6 files changed

+171
-3
lines changed

‎.github/ISSUE_TEMPLATE/bug-report.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
---
2+
name: Bug Report
3+
about: Report an error or abnormal run
4+
labels: bug
5+
---
6+
7+
### Community Note
8+
9+
* 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
10+
* 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
11+
* If you are interested in working on this issue or have submitted a pull request, please leave a comment
12+
13+
<!--- Please, keep this note for the community --->
14+
15+
### Run Output
16+
17+
18+
### Expected Behavior
19+
20+
<!--- What should have happened? --->
21+
22+
### Actual Behavior
23+
24+
<!--- What actually happened? --->
25+
26+
### Steps to Reproduce
27+
28+
<!--- Please list the steps required to reproduce the issue. --->

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
blank_issues_enabled: true
2+
contact_links: []

‎.github/ISSUE_TEMPLATE/feature-request.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Feature Request
3+
about: Think about a new feature
4+
labels: enhancement
5+
---
6+
7+
### Community Note
8+
9+
* 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
10+
* 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
11+
* If you are interested in working on this issue or have submitted a pull request, please leave a comment
12+
13+
<!--- Please, keep this note for the community --->
14+
15+
### Description
16+
17+
<!--- Describe your feature request here. --->
18+
19+
### References
20+
21+
<!---
22+
Information about referencing Github Issues: https://help.github.com/articles/basic-writing-and-formatting-syntax/#referencing-issues-and-pull-requests
23+
--->
24+
25+
* #0000

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ name: CI
44

55
on:
66
pull_request: null
7-
push: null
7+
push:
8+
branches-ignore:
9+
- 'pyup-update*'
10+
tags:
11+
- '*'
812

913
jobs:
1014
tests:

‎.mergify.yml‎

Lines changed: 110 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,120 @@
11
---
22

33
pull_request_rules:
4+
- name: 'Ensure all pull requests use the "develop" base branch'
5+
conditions:
6+
- 'base!=develop'
7+
actions:
8+
comment:
9+
message: |
10+
Hi,
11+
You've select an invalid base branch, we only authorize "develop".
12+
Please fix it, thanks.
13+
label:
14+
add:
15+
- 'invalid'
16+
remove:
17+
- 'ready to merge'
18+
- name: 'Assign all pull requests to achaussier'
19+
conditions:
20+
- '#assignee=0'
21+
actions:
22+
assign:
23+
users:
24+
- 'achaussier'
25+
- name: 'Remove label "ready to merge" in case of CI errors'
26+
conditions:
27+
- 'status-failure~=.*'
28+
actions:
29+
label:
30+
remove:
31+
- 'ready to merge'
32+
- name: 'Remove label "ready to merge" if pull request is closed'
33+
conditions:
34+
- 'closed'
35+
actions:
36+
label:
37+
remove:
38+
- 'invalid'
39+
- 'ready to merge'
40+
- name: 'Remove label "ready to merge" if pull request is a draft'
41+
conditions:
42+
- 'draft'
43+
actions:
44+
label:
45+
remove:
46+
- 'ready to merge'
47+
- name: 'Remove label "conflict" if no conflict'
48+
conditions:
49+
- '-conflict'
50+
actions:
51+
label:
52+
remove:
53+
- 'conflict'
54+
- name: 'Add label "conflict" if a conflict is detected'
55+
conditions:
56+
- 'conflict'
57+
actions:
58+
label:
59+
add:
60+
- 'conflict'
61+
remove:
62+
- 'ready to merge'
63+
- name: 'Remove label "ready to merge" once pull request is merged'
64+
conditions:
65+
- 'merged'
66+
actions:
67+
label:
68+
remove:
69+
- 'ready to merge'
70+
- name: 'Add label "ready to merge" if CI is OK'
71+
conditions:
72+
- 'base=develop'
73+
- '-draft'
74+
- 'status-success=pyup.io/safety-ci'
75+
- 'status-success=tests (3.6, 2.8)'
76+
- 'status-success=tests (3.6, 2.9)'
77+
- 'status-success=tests (3.7, 2.8)'
78+
- 'status-success=tests (3.7, 2.9)'
79+
- 'status-success=tests (3.8, 2.8)'
80+
- 'status-success=tests (3.8, 2.9)'
81+
- '-status-failure=pyup.io/safety-ci'
82+
- '-status-failure=tests (3.6, 2.8)'
83+
- '-status-failure=tests (3.6, 2.9)'
84+
- '-status-failure=tests (3.7, 2.8)'
85+
- '-status-failure=tests (3.7, 2.9)'
86+
- '-status-failure=tests (3.8, 2.8)'
87+
- '-status-failure=tests (3.8, 2.9)'
88+
actions:
89+
label:
90+
add:
91+
- 'ready to merge'
92+
- name: 'Add label "dependencies" on PyUP pull requests'
93+
conditions:
94+
- 'author=pyup-bot'
95+
actions:
96+
label:
97+
add:
98+
- 'dependencies'
499
- name: 'Automatic merge PyUP updates on CI success'
5100
conditions:
6101
- 'author=pyup-bot'
7102
- 'base=develop'
8-
- 'status-success=tests'
103+
- 'status-success=pyup.io/safety-ci'
104+
- 'status-success=tests (3.6, 2.8)'
105+
- 'status-success=tests (3.6, 2.9)'
106+
- 'status-success=tests (3.7, 2.8)'
107+
- 'status-success=tests (3.7, 2.9)'
108+
- 'status-success=tests (3.8, 2.8)'
109+
- 'status-success=tests (3.8, 2.9)'
110+
- '-status-failure=pyup.io/safety-ci'
111+
- '-status-failure=tests (3.6, 2.8)'
112+
- '-status-failure=tests (3.6, 2.9)'
113+
- '-status-failure=tests (3.7, 2.8)'
114+
- '-status-failure=tests (3.7, 2.9)'
115+
- '-status-failure=tests (3.8, 2.8)'
116+
- '-status-failure=tests (3.8, 2.9)'
9117
actions:
118+
delete_head_branch: {}
10119
merge:
11120
method: 'merge'

‎requirements.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ansible-lint==4.2.0
22
docker==4.2.2
33
flake8==3.8.3
4-
molecule==3.0.4
4+
molecule==3.0.5
55
pytest==5.4.3
66
testinfra==5.2.1
77
tox==3.16.1

0 commit comments

Comments
 (0)