Skip to content

Commit abe777a

Browse files
authored
Merge branch 'master' into unique-subject
2 parents e676168 + 9e1e906 commit abe777a

File tree

5 files changed

+45
-29
lines changed

5 files changed

+45
-29
lines changed

.circleci/config.yml

+39-27
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,65 @@
1+
---
2+
lint_and_unit: &lint_and_unit
3+
- delivery
4+
- danger
5+
- lint-yaml
6+
- lint-markdown
7+
18
version: 2.1
29

310
orbs:
4-
kitchen: sous-chefs/kitchen@1.0.0
11+
kitchen: sous-chefs/kitchen@2
512

613
workflows:
714
kitchen:
815
jobs:
16+
# Lint and Unit Test
17+
- kitchen/yamllint:
18+
name: lint-yaml
19+
- kitchen/mdlint:
20+
name: lint-markdown
921
- kitchen/danger:
1022
name: danger
1123
context: Danger
12-
- kitchen/lint:
13-
name: lint
24+
- kitchen/delivery:
25+
name: delivery
1426
- kitchen/dokken-single:
1527
name: server-debian-8
16-
suite: server
17-
platform: debian-8
18-
requires: [danger, lint]
28+
suite: server-debian-8
29+
requires:
30+
*lint_and_unit
1931
- kitchen/dokken-single:
2032
name: server-debian-9
21-
suite: server
22-
platform: debian-9
23-
requires: [danger, lint]
33+
suite: server-debian-9
34+
requires:
35+
*lint_and_unit
2436
- kitchen/dokken-single:
2537
name: server-centos-7
26-
suite: server
27-
platform: centos-7
28-
requires: [danger, lint]
38+
suite: server-centos-7
39+
requires:
40+
*lint_and_unit
2941
- kitchen/dokken-single:
3042
name: server-fedora-latest
31-
suite: server
32-
platform: fedora-latest
33-
requires: [danger, lint]
43+
suite: server-fedora-latest
44+
requires:
45+
*lint_and_unit
3446
- kitchen/dokken-single:
3547
name: server-ubuntu-1604
36-
suite: server
37-
platform: ubuntu-1604
38-
requires: [danger, lint]
48+
suite: server-ubuntu-1604
49+
requires:
50+
*lint_and_unit
3951
- kitchen/dokken-single:
4052
name: server-ubuntu-1804
41-
suite: server
42-
platform: ubuntu-1804
43-
requires: [danger, lint]
53+
suite: server-ubuntu-1804
54+
requires:
55+
*lint_and_unit
4456
- kitchen/dokken-single:
4557
name: server-verify-no-databag-ubuntu-1604
46-
suite: server-verify-no-databag
47-
platform: ubuntu-1604
48-
requires: [danger, lint]
58+
suite: server-verify-no-databag-ubuntu-1604
59+
requires:
60+
*lint_and_unit
4961
- kitchen/dokken-single:
5062
name: server-verification-ubuntu-1604
51-
suite: server-verification
52-
platform: ubuntu-1604
53-
requires: [danger, lint]
63+
suite: server-verification-ubuntu-1604
64+
requires:
65+
*lint_and_unit

.github/lock.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
---
12
# Configuration for lock-threads - https://github.com/dessant/lock-threads
23

34
# Number of days of inactivity before a closed issue or pull request is locked
45
daysUntilLock: 365
56

6-
# Issues and pull requests with these labels will not be locked. Set to `[]` to disable
7+
# Issues and pull requests with these labels will not be locked.
8+
# Set to `[]` to disable
79
exemptLabels: []
810

911
# Label to add before locking, such as `outdated`. Set to `false` to disable

.mdlrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
rules "~MD013", "~MD024"

.rubocop.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
AllCops:
23
Exclude:
34
- 'Dangerfile'

TESTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
Please refer to
2-
https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD
2+
[testing documentation](https://github.com/chef-cookbooks/community_cookbook_documentation/blob/master/TESTING.MD)

0 commit comments

Comments
 (0)