Skip to content

Commit 28928ad

Browse files
authored
fix(ci): Update workflows to use release pipeline (#406)
Signed-off-by: Dan Webb <dan.webb@damacus.io>
1 parent 6569a82 commit 28928ad

12 files changed

Lines changed: 207 additions & 130 deletions
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: conventional-commits
3+
4+
"on":
5+
pull_request:
6+
types:
7+
- opened
8+
- reopened
9+
- edited
10+
- synchronize
11+
12+
jobs:
13+
conventional-commits:
14+
uses: sous-chefs/.github/.github/workflows/conventional-commits.yml@5.0.3
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
name: 'Copilot Setup Steps'
3+
4+
"on":
5+
workflow_dispatch:
6+
push:
7+
paths:
8+
- .github/workflows/copilot-setup-steps.yml
9+
pull_request:
10+
paths:
11+
- .github/workflows/copilot-setup-steps.yml
12+
13+
jobs:
14+
copilot-setup-steps:
15+
runs-on: ubuntu-latest
16+
permissions:
17+
contents: read
18+
steps:
19+
- name: Check out code
20+
uses: actions/checkout@v5
21+
- name: Install Chef
22+
uses: actionshub/chef-install@main
23+
- name: Install cookbooks
24+
run: berks install
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
---
2+
name: prevent-file-change
3+
4+
"on":
5+
pull_request:
6+
types:
7+
- opened
8+
- reopened
9+
- edited
10+
- synchronize
11+
12+
jobs:
13+
prevent-file-change:
14+
uses: sous-chefs/.github/.github/workflows/prevent-file-change.yml@5.0.3
15+
secrets:
16+
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: release
3+
4+
"on":
5+
push:
6+
branches:
7+
- main
8+
9+
permissions:
10+
contents: write
11+
issues: write
12+
pull-requests: write
13+
packages: write
14+
attestations: write
15+
id-token: write
16+
17+
jobs:
18+
release:
19+
uses: sous-chefs/.github/.github/workflows/release-cookbook.yml@5.0.3
20+
secrets:
21+
token: ${{ secrets.PORTER_GITHUB_TOKEN }}
22+
supermarket_user: ${{ secrets.CHEF_SUPERMARKET_USER }}
23+
supermarket_key: ${{ secrets.CHEF_SUPERMARKET_KEY }}

.markdownlint-cli2.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ config:
33
line-length: false # MD013
44
no-duplicate-heading: false # MD024
55
reference-links-images: false # MD052
6+
no-multiple-blanks:
7+
maximum: 2
68
ignores:
79
- .github/copilot-instructions.md

.release-please-manifest.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
".": "2.0.9"
3+
}

CHANGELOG.md

Lines changed: 37 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
## Unreleased
6-
75
Standardise files with files in sous-chefs/repo-management
8-
96
Standardise files with files in sous-chefs/repo-management
107

11-
## 2.0.9 - *2025-09-04*
12-
138
## 2.0.8 - *2025-06-08*
149

1510
Standardise files with files in sous-chefs/repo-management
@@ -26,26 +21,16 @@ Standardise files with files in sous-chefs/repo-management
2621

2722
Standardise files with files in sous-chefs/repo-management
2823

29-
## 2.0.6 - *2024-05-03*
30-
3124
## 2.0.5 - *2024-05-03*
3225

3326
Standardise files with files in sous-chefs/repo-management
3427

35-
## 2.0.4 - *2023-09-28*
36-
37-
## 2.0.3 - *2023-09-04*
38-
39-
## 2.0.2 - *2023-07-10*
40-
41-
## 2.0.1 - *2023-05-17*
42-
4328
## 2.0.0 - *2023-04-04*
4429

45-
- Standardise files with files in sous-chefs/repo-management
46-
- Stop running broken rspec tests
47-
- Require Chef 15.3+ for unified_mode
48-
- Require unified_mode for all resources
30+
* Standardise files with files in sous-chefs/repo-management
31+
* Stop running broken rspec tests
32+
* Require Chef 15.3+ for unified_mode
33+
* Require unified_mode for all resources
4934

5035
## 1.3.11 - *2023-04-01*
5136

@@ -67,91 +52,89 @@ Remove Delivery
6752

6853
Standardise files with files in sous-chefs/repo-management
6954

70-
## 1.3.6 - *2023-02-14*
71-
7255
## 1.3.5 - *2022-12-11*
7356

7457
Standardise files with files in sous-chefs/repo-management
7558

7659
## 1.3.4 - *2022-02-17*
7760

78-
- Standardise files with files in sous-chefs/repo-management
79-
- Remove delivery folder
61+
* Standardise files with files in sous-chefs/repo-management
62+
* Remove delivery folder
8063

8164
## 1.3.3 - *2021-08-30*
8265

83-
- Standardise files with files in sous-chefs/repo-management
66+
* Standardise files with files in sous-chefs/repo-management
8467

8568
## 1.3.1 (2020-09-16)
8669

87-
- resolved cookstyle error: libraries/provider_carbon_conf_accumulator.rb:37:7 refactor: `ChefModernize/ActionMethodInResource`
88-
- resolved cookstyle error: libraries/provider_storage_conf_accumulator.rb:37:7 refactor: `ChefModernize/ActionMethodInResource`
89-
- Fix frozen method error in libraries/chef_graphite_carbon_config_converter.rb
90-
- Cookstyle Bot Auto Corrections with Cookstyle 6.16.8
70+
* resolved cookstyle error: libraries/provider_carbon_conf_accumulator.rb:37:7 refactor: `ChefModernize/ActionMethodInResource`
71+
* resolved cookstyle error: libraries/provider_storage_conf_accumulator.rb:37:7 refactor: `ChefModernize/ActionMethodInResource`
72+
* Fix frozen method error in libraries/chef_graphite_carbon_config_converter.rb
73+
* Cookstyle Bot Auto Corrections with Cookstyle 6.16.8
9174

9275
## 1.3.0 (2020-06-06)
9376

94-
- Fix bug with changing a frozen string in ruby 2.7.0
77+
* Fix bug with changing a frozen string in ruby 2.7.0
9578

9679
## 1.2.0 (2020-05-27)
9780

98-
- Fix Django/Twisted overridden version ([#318])
81+
* Fix Django/Twisted overridden version ([#318])
9982

10083
## 1.1.1 - (2020-05-14)
10184

102-
- resolved cookstyle error: libraries/provider_carbon_conf_accumulator.rb:50:83 convention: `Layout/TrailingWhitespace`
103-
- resolved cookstyle error: libraries/provider_carbon_conf_accumulator.rb:50:84 refactor: `ChefModernize/FoodcriticComments`
104-
- resolved cookstyle error: libraries/provider_storage_conf_accumulator.rb:48:83 convention: `Layout/TrailingWhitespace`
105-
- resolved cookstyle error: libraries/provider_storage_conf_accumulator.rb:48:84 refactor: `ChefModernize/FoodcriticComments`
106-
- Migrate to github actions
107-
- Ran linters and addressed issues
108-
- Ran latest cookstyle
109-
- Remove unnecessary actions method in the resources
85+
* resolved cookstyle error: libraries/provider_carbon_conf_accumulator.rb:50:83 convention: `Layout/TrailingWhitespace`
86+
* resolved cookstyle error: libraries/provider_carbon_conf_accumulator.rb:50:84 refactor: `ChefModernize/FoodcriticComments`
87+
* resolved cookstyle error: libraries/provider_storage_conf_accumulator.rb:48:83 convention: `Layout/TrailingWhitespace`
88+
* resolved cookstyle error: libraries/provider_storage_conf_accumulator.rb:48:84 refactor: `ChefModernize/FoodcriticComments`
89+
* Migrate to github actions
90+
* Ran linters and addressed issues
91+
* Ran latest cookstyle
92+
* Remove unnecessary actions method in the resources
11093

11194
## [1.1.0] - 2019-09-05
11295

113-
- Fix cookstyle issues
114-
- Should now work with Chef 13, 14 and 15
115-
- Syntax and styling updates
116-
- Compatibility with Chef 13 (.[@oscar123mendoza])
96+
* Fix cookstyle issues
97+
* Should now work with Chef 13, 14 and 15
98+
* Syntax and styling updates
99+
* Compatibility with Chef 13 (.[@oscar123mendoza])
117100

118101
## [1.0.4] - 2016-01-29
119102

120103
### Added
121104

122-
- Adds License and Code of Conduct
105+
* Adds License and Code of Conduct
123106

124107
### Fixed
125108

126-
- Syntax and styling updates
127-
- Use full Twisted version number
128-
- Manage graphite nofile ulimit
129-
- Fixes carbon source
109+
* Syntax and styling updates
110+
* Use full Twisted version number
111+
* Manage graphite nofile ulimit
112+
* Fixes carbon source
130113

131114
### Known Issues
132115

133-
- Reordering of Carbon .ini [241](https://github.com/sous-chefs/graphite/issues/241)
134-
- Graphite web timeout when restarting [224](https://github.com/sous-chefs/graphite/issues/224)
116+
* Reordering of Carbon .ini [241](https://github.com/sous-chefs/graphite/issues/241)
117+
* Graphite web timeout when restarting [224](https://github.com/sous-chefs/graphite/issues/224)
135118

136119
## [1.0.2] - 2014-11-18
137120

138121
### Fixed
139122

140-
- README improvements to address resource usage and removal of Apache dependency ([@webframp], [#187])
141-
- restart graphite-web in graphite_example sample recipe ([@obazoud], [#182])
142-
- remove unused `['graphite']['web_server']` attribute ([@obazoud], [#181])
123+
* README improvements to address resource usage and removal of Apache dependency ([@webframp], [#187])
124+
* restart graphite-web in graphite_example sample recipe ([@obazoud], [#182])
125+
* remove unused `['graphite']['web_server']` attribute ([@obazoud], [#181])
143126

144127
## [1.0.1] - 2014-08-27
145128

146129
### Fixed
147130

148-
- Readme improvements.
131+
* Readme improvements.
149132

150133
## [1.0.0] - 2014-08-27
151134

152135
### Breaking Changes
153136

154-
- Initial release of graphite library style cookbook. Complete rewrite of cookbook to provide reusable resources. Breaks backward compatibility with cookbook version prior 1.0\. ([@webframp], [@fnichol], [@agoddard])
137+
* Initial release of graphite library style cookbook. Complete rewrite of cookbook to provide reusable resources. Breaks backward compatibility with cookbook version prior 1.0\. ([@webframp], [@fnichol], [@agoddard])
155138

156139
<!-- - The following link definition list is generated by PimpMyChangelog - -->
157140

release-please-config.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"packages": {
3+
".": {
4+
"package-name": "graphite",
5+
"changelog-path": "CHANGELOG.md",
6+
"release-type": "ruby",
7+
"include-component-in-tag": false,
8+
"version-file": "metadata.rb"
9+
}
10+
},
11+
"$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json"
12+
}

test/fixtures/cookbooks/test/recipes/carbon_aggregator.rb

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
graphite_carbon_aggregator 'default' do
44
config({
5-
line_receiver_interface: '0.0.0.0',
6-
line_receiver_port: 2005,
7-
replication_factor: 1,
8-
use_flow_control: true,
9-
relay_method: 'consistent-hashing',
10-
destinations: [
11-
'127.0.0.1:2003:a',
12-
'127.0.0.1:2004:b',
13-
],
14-
})
5+
line_receiver_interface: '0.0.0.0',
6+
line_receiver_port: 2005,
7+
replication_factor: 1,
8+
use_flow_control: true,
9+
relay_method: 'consistent-hashing',
10+
destinations: [
11+
'127.0.0.1:2003:a',
12+
'127.0.0.1:2004:b',
13+
],
14+
})
1515
end

test/fixtures/cookbooks/test/recipes/carbon_cache.rb

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,55 @@
22

33
graphite_carbon_cache 'default' do
44
config({
5-
enable_logrotation: true,
6-
user: 'graphite',
7-
max_cache_size: 'inf',
8-
max_updates_per_second: 500,
9-
max_creates_per_minute: 50,
10-
line_receiver_interface: '0.0.0.0',
11-
line_receiver_port: 2003,
12-
udp_receiver_port: 2003,
13-
pickle_receiver_port: 2004,
14-
enable_udp_listener: true,
15-
cache_query_port: '7002',
16-
cache_write_strategy: 'sorted',
17-
use_flow_control: true,
18-
log_updates: false,
19-
log_cache_hits: false,
20-
whisper_autoflush: false,
21-
})
5+
enable_logrotation: true,
6+
user: 'graphite',
7+
max_cache_size: 'inf',
8+
max_updates_per_second: 500,
9+
max_creates_per_minute: 50,
10+
line_receiver_interface: '0.0.0.0',
11+
line_receiver_port: 2003,
12+
udp_receiver_port: 2003,
13+
pickle_receiver_port: 2004,
14+
enable_udp_listener: true,
15+
cache_query_port: '7002',
16+
cache_write_strategy: 'sorted',
17+
use_flow_control: true,
18+
log_updates: false,
19+
log_cache_hits: false,
20+
whisper_autoflush: false,
21+
})
2222
end
2323

2424
graphite_carbon_cache 'a' do
2525
config({
26-
line_receiver_port: 2004,
27-
udp_receiver_port: 2004,
28-
pickle_receiver_port: 2005,
29-
cache_query_port: 7003,
30-
})
26+
line_receiver_port: 2004,
27+
udp_receiver_port: 2004,
28+
pickle_receiver_port: 2005,
29+
cache_query_port: 7003,
30+
})
3131
end
3232

3333
graphite_carbon_cache 'b' do
3434
config({
35-
line_receiver_port: 2006,
36-
udp_receiver_port: 2006,
37-
pickle_receiver_port: 2007,
38-
cache_query_port: 7004,
39-
})
35+
line_receiver_port: 2006,
36+
udp_receiver_port: 2006,
37+
pickle_receiver_port: 2007,
38+
cache_query_port: 7004,
39+
})
4040
end
4141

4242
graphite_storage_schema 'carbon' do
4343
config({
44-
pattern: '^carbon.',
45-
retentions: '60:90d',
46-
})
44+
pattern: '^carbon.',
45+
retentions: '60:90d',
46+
})
4747
end
4848

4949
graphite_storage_schema 'default_1min_for_1day' do
5050
config({
51-
pattern: '.*',
52-
retentions: '60s:1d',
53-
})
51+
pattern: '.*',
52+
retentions: '60s:1d',
53+
})
5454
end
5555

5656
graphite_service 'cache:a'

0 commit comments

Comments
 (0)