Skip to content

Commit 658f44d

Browse files
author
Christopher - Marcel Böddecker
committed
Merge branch 'next'
2 parents e712a2e + cb47e13 commit 658f44d

File tree

3 files changed

+178
-23
lines changed

3 files changed

+178
-23
lines changed

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,33 @@
11
# Changelog
22

3+
## [3.9.0-next.1](https://github.com/ExtendRealityLtd/DevOps/compare/v3.8.0...v3.9.0-next.1) (2019-10-14)
4+
5+
6+
#### Features
7+
8+
* **templates:** pretty, sorted changelog/release notes in CD ([763cf1d](https://github.com/ExtendRealityLtd/DevOps/commit/763cf1dbc04060bf5e289cdad94fb4f4a19936bf))
9+
#### Bug Fixes
10+
11+
* **templates:** CD failure when commit body is empty ([34f4c71](https://github.com/ExtendRealityLtd/DevOps/commit/34f4c71f6282c624868a6d5c5ff38fa2e7c8088d))* **templates:** release pre-release packages on the default channel ([fdc9579](https://github.com/ExtendRealityLtd/DevOps/commit/fdc9579d621250041d02fe13bdc2a9a0ba614ed8))
12+
#### Miscellaneous Chores
13+
14+
* **release:** set version to 3.6.0-next.1 [skip ci] ([f65d680](https://github.com/ExtendRealityLtd/DevOps/commit/f65d680cdf06fba031fc16638e9c0053021d36e8))
15+
> ## [3.6.0-next.1](https://github.com/ExtendRealityLtd/DevOps/compare/v3.5.6...v3.6.0-next.1@next) (2019-10-13)
16+
>
17+
> ### Features
18+
>
19+
> * **templates:** adhere to latest workflow conventions ([1583546](https://github.com/ExtendRealityLtd/DevOps/commit/15835462980afbef1dfdb8cf89e6f4fdf5ab0283))
20+
> * **templates:** treat the master branch as a release branch ([d8b9ad4](https://github.com/ExtendRealityLtd/DevOps/commit/d8b9ad4a756068ab89de88a2203f1603b3a7faad))
21+
> * **templates:** use latest Windows VM image ([f3df0b9](https://github.com/ExtendRealityLtd/DevOps/commit/f3df0b949e361b4f72dea2a71c79a58c0f130f7c))
22+
> * **templates:** use universal CI skip commit message ([28e2b3e](https://github.com/ExtendRealityLtd/DevOps/commit/28e2b3e1e2fe998d006962ee7a8b5e4352b53944))
23+
>
24+
> ### Bug Fixes
25+
>
26+
> * **templates:** .meta file check when package has dependencies ([7130b5e](https://github.com/ExtendRealityLtd/DevOps/commit/7130b5eef0299d5d424c2b0788dba0c7110f4b4a))
27+
> * **templates:** correct path for Unity assemblies ([c1b9801](https://github.com/ExtendRealityLtd/DevOps/commit/c1b9801890acc30c3b67b36bc59d6267b53e8098))
28+
> * **templates:** MSBuild failing due to trailing slash ([25a8435](https://github.com/ExtendRealityLtd/DevOps/commit/25a843506e5157520569f6d2c2ca71c9a5a5e220))
29+
> * **templates:** semantic-release configuration file name ([bb0b05d](https://github.com/ExtendRealityLtd/DevOps/commit/bb0b05d1df334fd985e64263764f50522666fa5c))
30+
331
## [3.8.0](https://github.com/ExtendRealityLtd/DevOps/compare/v3.7.2...v3.8.0) (2019-10-13)
432

533

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "io.extendreality.devops",
33
"displayName": "DevOps",
44
"description": "A collection of templates to simplify the continuous integration and deployment of projects by https://github.com/ExtendRealityLtd.",
5-
"version": "3.8.0",
5+
"version": "3.9.0-next.1",
66
"homepage": "https://github.com/ExtendRealityLtd/DevOps/",
77
"bugs": {
88
"url": "https://github.com/ExtendRealityLtd/DevOps/issues"

‎templates/steps/cd.yml‎

Lines changed: 149 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ steps:
113113
branches: [
114114
'+([0-9])?(.{+([0-9]),x}).x',
115115
{ name: 'master', channel: false },
116-
{ name: 'next', channel: 'next', prerelease: 'next' },
117-
{ name: 'next-major', channel: 'next-major', prerelease: 'next-major' }
116+
{ name: 'next', channel: false, prerelease: 'next' },
117+
{ name: 'next-major', channel: false, prerelease: 'next-major' }
118118
],
119119
tagFormat: 'v${version}',
120120
plugins: [
@@ -133,6 +133,150 @@ steps:
133133
preset: 'conventionalcommits',
134134
parserOpts,
135135
writerOpts: {
136+
finalizeContext: (context) => {
137+
const prefix = ' > '
138+
context.commitGroups.forEach(group => {
139+
group.commits.forEach(commit => {
140+
if (commit.body) {
141+
commit.body = prefix + commit.body.split('\n').join('\n' + prefix)
142+
}
143+
})
144+
group.commits = group.commits.filter(commit => !(commit.type == 'Miscellaneous Chores' && commit.scope == 'release'))
145+
})
146+
context.commitGroups = context.commitGroups.filter(group => group.commits.length > 0)
147+
return context
148+
},
149+
mainTemplate: `
150+
{{> header}}
151+
152+
{{#if noteGroups}}
153+
{{#each noteGroups}}
154+
#### :warning: {{title}} :warning:
155+
156+
{{#each notes}}
157+
* {{#if commit.scope}}**{{commit.scope}}:** {{/if}}{{text}}
158+
{{~!-- commit link --}} {{#if @root.linkReferences~}}
159+
([{{commit.shortHash}}](
160+
{{~#if @root.repository}}
161+
{{~#if @root.host}}
162+
{{[email protected]}}/
163+
{{~/if}}
164+
{{~#if @root.owner}}
165+
{{[email protected]}}/
166+
{{~/if}}
167+
{{[email protected]}}
168+
{{~else}}
169+
{{[email protected]}}
170+
{{~/if}}/
171+
{{[email protected]}}/{{commit.hash}}))
172+
{{~else}}
173+
{{~commit.shortHash}}
174+
{{~/if}}
175+
176+
{{/each}}
177+
{{/each}}
178+
{{/if}}
179+
180+
{{#each commitGroups}}
181+
{{#if title}}
182+
#### {{title}}
183+
184+
{{/if}}
185+
{{#each commits}}
186+
{{> commit root=@root}}
187+
{{/each}}
188+
189+
{{/each}}
190+
`,
191+
commitPartial: `*{{#if scope}} **{{scope}}:**
192+
{{~/if}} {{#if subject}}
193+
{{~subject}}
194+
{{~else}}
195+
{{~header}}
196+
{{~/if}}
197+
198+
{{~!-- commit link --}} {{#if @root.linkReferences~}}
199+
([{{shortHash}}](
200+
{{~#if @root.repository}}
201+
{{~#if @root.host}}
202+
{{[email protected]}}/
203+
{{~/if}}
204+
{{~#if @root.owner}}
205+
{{[email protected]}}/
206+
{{~/if}}
207+
{{[email protected]}}
208+
{{~else}}
209+
{{[email protected]}}
210+
{{~/if}}/
211+
{{[email protected]}}/{{hash}}))
212+
{{~else}}
213+
{{~shortHash}}
214+
{{~/if}}
215+
216+
{{~!-- commit references --}}
217+
{{~#if references~}}
218+
, closes
219+
{{~#each references}} {{#if @root.linkReferences~}}
220+
[
221+
{{~#if this.owner}}
222+
{{~this.owner}}/
223+
{{~/if}}
224+
{{~this.repository}}#{{this.issue}}](
225+
{{~#if @root.repository}}
226+
{{~#if @root.host}}
227+
{{[email protected]}}/
228+
{{~/if}}
229+
{{~#if this.repository}}
230+
{{~#if this.owner}}
231+
{{~this.owner}}/
232+
{{~/if}}
233+
{{~this.repository}}
234+
{{~else}}
235+
{{~#if @root.owner}}
236+
{{[email protected]}}/
237+
{{~/if}}
238+
{{[email protected]}}
239+
{{~/if}}
240+
{{~else}}
241+
{{[email protected]}}
242+
{{~/if}}/
243+
{{[email protected]}}/{{this.issue}})
244+
{{~else}}
245+
{{~#if this.owner}}
246+
{{~this.owner}}/
247+
{{~/if}}
248+
{{~this.repository}}#{{this.issue}}
249+
{{~/if}}{{/each}}
250+
{{~/if}}
251+
252+
{{~#if body}}
253+
254+
{{body}}
255+
{{/if}}
256+
`,
257+
commitGroupsSort: (a, b) => {
258+
const order = [
259+
'Features',
260+
'Bug Fixes',
261+
'Performance Improvements',
262+
'Documentation',
263+
'Tests',
264+
'Code Refactoring',
265+
'Styles',
266+
'Build System',
267+
'Continuous Integration',
268+
'Miscellaneous Chores'
269+
]
270+
const indexA = order.indexOf(a.title)
271+
const indexB = order.indexOf(b.title)
272+
if (indexA >= indexB) {
273+
return 1
274+
} else {
275+
return -1
276+
}
277+
}
278+
},
279+
presetConfig: {
136280
types: [
137281
{ type: 'feat', section: 'Features' },
138282
{ type: 'fix', section: 'Bug Fixes' },
@@ -142,7 +286,8 @@ steps:
142286
{ type: 'refactor', section: 'Code Refactoring' },
143287
{ type: 'style', section: 'Styles' },
144288
{ type: 'build', section: 'Build System' },
145-
{ type: 'ci', section: 'Continuous Integration' }
289+
{ type: 'ci', section: 'Continuous Integration' },
290+
{ type: 'chore', section: 'Miscellaneous Chores' }
146291
]
147292
}
148293
}],
@@ -169,25 +314,7 @@ steps:
169314
labels: 'failed-release',
170315
releasedLabels: 'released'
171316
}]
172-
],
173-
commitGroupsSort: (a, b) => {
174-
const order = [
175-
'Features',
176-
'Bug Fixes',
177-
'Performance Improvements',
178-
'Documentation',
179-
'Tests',
180-
'Code Refactoring',
181-
'Styles',
182-
'Build System',
183-
'Continuous Integration'
184-
]
185-
if (order.indexOf(a.title) >= order.indexOf(b.title)) {
186-
return -1
187-
} else {
188-
return 1
189-
}
190-
}
317+
]
191318
};
192319
EOF
193320
displayName: Create semantic-release.config.js

0 commit comments

Comments
 (0)