Skip to content

Commit 6d97315

Browse files
committed
merge: resolve conflicts keeping main content (#19)
2 parents 5fe9d35 + da79432 commit 6d97315

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+1298
-5110
lines changed

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
trim_trailing_whitespace = true
8+
indent_style = space
9+
indent_size = 2
10+
11+
[*.{py}]
12+
indent_size = 4
13+
14+
[*.md]
15+
trim_trailing_whitespace = false

.gitattributes

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
* text=auto eol=lf
2+
*.sh text eol=lf
3+
*.py text eol=lf
4+
*.ts text eol=lf
5+
*.yml text eol=lf
6+
*.yaml text eol=lf
7+
*.md text eol=lf
8+
*.png binary
9+
*.jpg binary
10+
*.jpeg binary
11+
*.gif binary

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Default code owner
2+
* @CoderDeltaLAN
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Bug report
2+
description: Report a problem
3+
labels: [bug]
4+
body:
5+
- type: textarea
6+
id: what-happened
7+
attributes:
8+
label: What happened?
9+
description: Describe the bug and expected behavior.
10+
validations:
11+
required: true
12+
- type: input
13+
id: version
14+
attributes:
15+
label: Version
16+
description: Project version used (e.g., 0.1.7).
17+
- type: textarea
18+
id: steps
19+
attributes:
20+
label: Steps to reproduce
21+
description: Minimal steps to reproduce the issue.
22+
- type: textarea
23+
id: logs
24+
attributes:
25+
label: Logs
26+
description: Relevant logs or CI run URL.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Security vulnerability
4+
url: https://github.com/CoderDeltaLAN/ci-matrix-starter/security/advisories/new
5+
about: Please report security issues privately.
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: Feature request
2+
description: Propose an enhancement
3+
labels: [enhancement]
4+
body:
5+
- type: textarea
6+
id: problem
7+
attributes:
8+
label: Problem
9+
description: What problem does this feature solve?
10+
validations:
11+
required: true
12+
- type: textarea
13+
id: proposal
14+
attributes:
15+
label: Proposal
16+
description: Describe the solution you'd like.
17+
placeholder: API/UI/behavior changes, trade-offs.
18+
- type: textarea
19+
id: alternatives
20+
attributes:
21+
label: Alternatives considered

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
## Summary
2+
3+
Short description of the change.
4+
5+
## Type
6+
7+
- [ ] Feature
8+
- [ ] Fix
9+
- [ ] Chore
10+
- [ ] Docs
11+
- [ ] CI/CD
12+
13+
## Checklist
14+
15+
- [ ] Local radar green (`scripts/ci-local.sh` or pre-commit + actionlint)
16+
- [ ] Tests pass
17+
- [ ] No new linter warnings
18+
- [ ] Docs updated if needed
19+
20+
## Notes
21+
22+
Link to related issue(s) if any.

.github/auto_assign.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
reviewers:
2+
- CoderDeltaLAN
3+
assignees:
4+
- CoderDeltaLAN
5+
addReviewers: true
6+
addAssignees: author

.github/dependabot.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "weekly"
7+
day: "saturday"
8+
time: "06:00"
9+
- package-ecosystem: "npm"
10+
directory: "/"
11+
schedule:
12+
interval: "weekly"
13+
day: "saturday"
14+
time: "06:15"
15+
- package-ecosystem: "pip"
16+
directory: "/"
17+
schedule:
18+
interval: "weekly"
19+
day: "saturday"
20+
time: "06:30"

.github/labeler.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
docs:
2+
- changed-files:
3+
- any-glob-to-any-file: ["**/*.md", "docs/**", "README.md"]
4+
ci:
5+
- changed-files:
6+
- any-glob-to-any-file: [".github/workflows/**", "scripts/**/*.sh"]
7+
python:
8+
- changed-files:
9+
- any-glob-to-any-file: ["pyproject.toml", "**/*.py", "tests/**/*.py"]
10+
typescript:
11+
- changed-files:
12+
- any-glob-to-any-file:
13+
["src/**/*.ts", "tsconfig.json", "eslint.config.mjs", "package.json"]

0 commit comments

Comments
 (0)