Skip to content

Commit 198a0f3

Browse files
committed
Merge remote-tracking branch 'origin/main' into develop
# Conflicts: # .github/release-drafter.yml
2 parents f69b2dd + 89c6dea commit 198a0f3

12 files changed

Lines changed: 240 additions & 149 deletions
Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,34 @@
1-
renderer:
1+
Gpu:
22
- changed-files:
33
- any-glob-to-any-file:
4-
- src/Graphics/**
5-
- src/Rendering/**
6-
7-
gpu:
8-
- changed-files:
9-
- any-glob-to-any-file:
10-
- Assets/Shaders/**
11-
- src/**/Gpu/**
4+
- src/Graphics/Gpu/**
125
- src/**/OpenGL/**
6+
- src/Graphics/Shaders/**
7+
- Assets/Shaders/**
138

14-
layout:
9+
Layout:
1510
- changed-files:
1611
- any-glob-to-any-file:
1712
- src/**/Layout/**
1813

19-
ecs:
14+
Renderer:
2015
- changed-files:
2116
- any-glob-to-any-file:
22-
- src/**/ECS/**
23-
- src/**/Entities/**
17+
- src/Graphics/Rendering/**
18+
- src/Rendering/**
2419

2520
tests:
2621
- changed-files:
2722
- any-glob-to-any-file:
2823
- tests/**
29-
- "**/*Tests.cs"
24+
- '**/*Tests.cs'
3025

31-
docs:
26+
documentation:
3227
- changed-files:
3328
- any-glob-to-any-file:
3429
- Docs/**
30+
- '*.md'
3531
- readme.md
36-
- "*.md"
3732

3833
ci:
3934
- changed-files:
Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,51 @@
11
- name: bug
2-
color: d73a4a
2+
color: "d73a4a"
33
description: Something isn't working
44

55
- name: enhancement
6-
color: a2eeef
6+
color: "a2eeef"
77
description: New feature or request
88

99
- name: documentation
10-
color: 0075ca
10+
color: "0075ca"
1111
description: Improvements or additions to documentation
1212

13-
- name: State One
14-
color: 0e8a16
15-
description: Workflow state one
16-
17-
- name: State Two
18-
color: bfdadc
19-
description: Workflow state two
20-
2113
- name: Architecture
22-
color: 8B5E3C
14+
color: "8B5E3C"
2315
description: Architecture-related changes
2416

2517
- name: Gpu
26-
color: 3A7D8C
18+
color: "3A7D8C"
2719
description: GPU-related rendering changes
2820

2921
- name: Layout
30-
color: 5B4B8A
22+
color: "5B4B8A"
3123
description: Layout engine and visualization changes
3224

3325
- name: Renderer
34-
color: 8A4F7D
26+
color: "8A4F7D"
3527
description: Renderer pipeline and visual output changes
3628

37-
- name: task
38-
color: 1d76db
29+
- name: Task
30+
color: "1d76db"
3931
description: Track a concrete implementation task
4032

41-
- name: ci
42-
color: 5319e7
33+
- name: Ci
34+
color: "5319e7"
4335
description: CI/CD and automation changes
4436

4537
- name: tests
46-
color: fbca04
38+
color: "fbca04"
4739
description: Test coverage and test changes
4840

4941
- name: Performance
50-
color: 0e4d92
42+
color: "0e4d92"
5143
description: Performance improvements or regressions
5244

5345
- name: breaking-change
54-
color: b60205
46+
color: "b60205"
5547
description: Introduces a breaking change
48+
49+
- name: skip-changelog
50+
color: "ededed"
51+
description: Exclude this change from release notes
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"LABEL": {
3+
"name": "",
4+
"color": "EEEEEE"
5+
},
6+
"CHECKS": {
7+
"regexp": "^(feat|fix|docs|style|refactor|perf|test|build|ci|chore)(\\([a-z0-9-]+\\))?: .+$",
8+
"regexpFlags": "i",
9+
"ignoreLabels": [
10+
"State One",
11+
"State Two"
12+
],
13+
"alwaysPassCI": false
14+
},
15+
"MESSAGES": {
16+
"success": "PR title matches the required format.",
17+
"failure": "PR title must match: type(optional-scope): description",
18+
"notice": "Allowed types: feat, fix, docs, style, refactor, perf, test, build, ci, chore."
19+
}
20+
}

.github/release-drafter.yml

Lines changed: 129 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,142 @@
11
name-template: 'v$RESOLVED_VERSION'
22
tag-template: 'v$RESOLVED_VERSION'
3+
tag-prefix: 'v'
4+
version-template: '$MAJOR.$MINOR.$PATCH'
5+
6+
sort-by: merged_at
7+
sort-direction: descending
8+
pull-request-limit: 100
9+
history-limit: 100
10+
11+
no-changes-template: '- No changes.'
12+
no-contributors-template: 'No contributors.'
13+
category-template: '## $TITLE'
14+
change-template: '- [$TITLE]($URL) by @$AUTHOR'
15+
change-title-escapes: '\<*_&`#@'
16+
17+
exclude-contributors:
18+
- github-actions
19+
- github-actions[bot]
20+
- dependabot
21+
- dependabot[bot]
322

423
categories:
24+
- type: pre-exclude
25+
when:
26+
labels:
27+
- skip-changelog
28+
- State One
29+
- State Two
30+
531
- title: 'Breaking Changes'
6-
labels:
7-
- breaking-change
8-
- title: 'Features'
9-
labels:
10-
- enhancement
11-
- title: 'Architecture'
12-
labels:
13-
- Architecture
14-
- title: 'Rendering'
15-
labels:
16-
- Renderer
17-
- Gpu
18-
- Layout
32+
semver-increment: major
33+
collapse-after: -1
34+
exclusive: true
35+
when:
36+
label: breaking-change
37+
38+
- title: 'Enhancements'
39+
semver-increment: minor
40+
collapse-after: 10
41+
exclusive: true
42+
when:
43+
label: enhancement
44+
45+
- title: 'Fixes'
46+
semver-increment: patch
47+
collapse-after: 10
48+
exclusive: true
49+
when:
50+
label: bug
51+
1952
- title: 'Performance'
20-
labels:
21-
- Performance
22-
- title: 'Bug Fixes'
23-
labels:
24-
- bug
53+
semver-increment: patch
54+
collapse-after: 8
55+
exclusive: true
56+
when:
57+
label: Performance
58+
59+
- title: 'Architecture'
60+
semver-increment: patch
61+
collapse-after: 8
62+
exclusive: true
63+
when:
64+
label: Architecture
65+
66+
- title: 'Renderer'
67+
semver-increment: patch
68+
collapse-after: 8
69+
exclusive: true
70+
when:
71+
label: Renderer
72+
73+
- title: 'Gpu'
74+
semver-increment: patch
75+
collapse-after: 8
76+
exclusive: true
77+
when:
78+
label: Gpu
79+
80+
- title: 'Layout'
81+
semver-increment: patch
82+
collapse-after: 8
83+
exclusive: true
84+
when:
85+
label: Layout
86+
2587
- title: 'Tests'
26-
labels:
27-
- tests
88+
semver-increment: patch
89+
collapse-after: 8
90+
exclusive: true
91+
when:
92+
label: tests
93+
2894
- title: 'Documentation'
29-
labels:
30-
- documentation
95+
semver-increment: patch
96+
collapse-after: 8
97+
exclusive: true
98+
when:
99+
label: documentation
100+
31101
- title: 'CI'
32-
labels:
33-
- ci
102+
semver-increment: patch
103+
collapse-after: 8
104+
exclusive: true
105+
when:
106+
label: ci
107+
34108
- title: 'Tasks'
35-
labels:
36-
- task
37-
38-
change-title-escapes: '\<*_&'
39-
40-
version-resolver:
41-
major:
42-
labels:
43-
- breaking-change
44-
minor:
45-
labels:
46-
- enhancement
47-
- Architecture
48-
- Renderer
49-
- Gpu
50-
- Layout
51-
- Performance
52-
patch:
53-
labels:
54-
- bug
55-
- ci
56-
- tests
57-
default: patch
109+
semver-increment: patch
110+
collapse-after: 8
111+
exclusive: true
112+
when:
113+
label: task
58114

59-
template: |
60-
## Changes
115+
- title: 'Other Changes'
116+
semver-increment: patch
117+
collapse-after: 8
118+
119+
- type: version-resolver
120+
semver-increment: major
121+
when:
122+
label: breaking-change
123+
124+
- type: version-resolver
125+
semver-increment: minor
126+
when:
127+
label: enhancement
61128

129+
- type: version-resolver
130+
semver-increment: patch
131+
132+
template: |
62133
$CHANGES
134+
135+
footer: |
136+
## Contributors
137+
138+
$CONTRIBUTORS
139+
140+
## Links
141+
142+
- Full changelog: https://github.com/$OWNER/$REPOSITORY/compare/$PREVIOUS_TAG...v$RESOLVED_VERSION

.github/workflows/auto-assign.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

.github/workflows/labels-sync.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,24 @@ on:
44
push:
55
branches: [ main ]
66
paths:
7-
- .github/labels.yml
7+
- .github/config/labels.yml
88
- .github/workflows/labels-sync.yml
99
workflow_dispatch:
1010

1111
permissions:
1212
issues: write
13+
contents: read
1314

1415
jobs:
1516
sync:
1617
runs-on: ubuntu-latest
18+
1719
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v5
22+
1823
- name: Sync repository labels
1924
uses: EndBug/label-sync@v2
2025
with:
21-
config-file: .github/labels.yml
26+
config-file: .github/config/labels.yml
2227
delete-other-labels: true

0 commit comments

Comments
 (0)