Skip to content

Commit af03e4a

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents d1607ee + f97bf1b commit af03e4a

File tree

358 files changed

+11840
-8136
lines changed

Some content is hidden

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

358 files changed

+11840
-8136
lines changed

‎.github/CODE_OF_CONDUCT.MD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Code of Conduct
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#code-of-conduct).

‎.github/ISSUE_TEMPLATE/BUG_REPORT.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
---
5+
6+
<!-- Thanks for reporting an issue! Please fill out the blanks below. -->
7+
8+
## What are the steps to reproduce this issue?
9+
10+
1. …
11+
2. …
12+
3. …
13+
14+
## What happens?
15+
16+
…
17+
18+
## What were you expecting to happen?
19+
20+
…
21+
22+
## Any logs, error output, etc?
23+
24+
…
25+
26+
## Any other comments?
27+
28+
…
29+
30+
## What versions are you using?
31+
32+
**Operating System:** …
33+
**Package Version:** …

‎.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Feature Request
3+
about: Request a new feature or enhancement
4+
---
5+
6+
<!-- Thanks for taking the time to recommend a feature! Please fill out the form below -->
7+
8+
## Summary
9+
10+
<!-- High level description of what this feature is -->
11+
12+
## Detailed Description
13+
14+
<!-- Lets get into the weeds here -->
15+
16+
## Possible Implementation Ideas
17+
18+
<!-- If you already have some idea of how to implement this, this would be the place to put it -->

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Description
2+
3+
Please include a summary of the changes and which issue(s) is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.
4+
5+
**Please note that all PRs must have tests attached to them**
6+
7+
IMPORTANT: Please review the [CONTRIBUTING.md](../CONTRIBUTING.md) file for detailed contributing guidelines.
8+
9+
## Jira Issues
10+
11+
All PRs must have an accompanied Jira issue. Please make sure you created it and linked it here.
12+
13+
> Bug Tracker: https://ortussolutions.atlassian.net/jira/software/c/projects/COLDBOX/issues
14+
15+
16+
## Type of change
17+
18+
Please delete options that are not relevant.
19+
20+
- [ ] Bug Fix
21+
- [ ] Improvement
22+
- [ ] New Feature
23+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
24+
- [ ] This change requires a documentation update
25+
26+
## Checklist
27+
28+
- [ ] My code follows the style guidelines of this project [cfformat](../.cfformat.json)
29+
- [ ] I have commented my code, particularly in hard-to-understand areas
30+
- [ ] I have made corresponding changes to the documentation
31+
- [ ] I have added tests that prove my fix is effective or that my feature works
32+
- [ ] New and existing unit tests pass locally with my changes

‎.github/SECURITY.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Security Policy
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#security-vulnerabilities).

‎.github/SUPPORT.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Support & Help
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#support-questions).

‎.github/workflows/gh-release.yml‎

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

‎.github/workflows/lts.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: ColdBox LTS Flow
2+
3+
on:
4+
push:
5+
branches:
6+
- "releases/**"
7+
8+
jobs:
9+
#############################################
10+
# Tests First baby! We fail, no build :(
11+
#############################################
12+
tests:
13+
uses: ./.github/workflows/tests.yml
14+
secrets: inherit
15+
16+
##########################################################################################
17+
# Format Source Code
18+
##########################################################################################
19+
format:
20+
name: Code Auto-Formatting
21+
runs-on: ubuntu-20.04
22+
steps:
23+
- uses: actions/checkout@v3
24+
25+
- name: Auto-format
26+
uses: Ortus-Solutions/[email protected]
27+
with:
28+
cmd: run-script format
29+
30+
- name: Commit Format Changes
31+
uses: stefanzweifel/git-auto-commit-action@v4
32+
with:
33+
commit_message: Apply cfformat changes
34+
push_options: --force

‎.github/workflows/pr.yml‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,29 @@
1-
name: Coldbox Pull Requests
1+
name: Pull Requests
22

33
on:
44
push:
55
branches-ignore:
66
- "main"
77
- "master"
88
- "development"
9+
- "releases/**"
910
pull_request:
1011
branches:
1112
- development
13+
- "releases/**"
1214

1315
jobs:
1416
tests:
15-
uses: ColdBox/coldbox-platform/.github/workflows/tests.yml@development
16-
secrets:
17-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
17+
uses: ./.github/workflows/tests.yml
18+
secrets: inherit
1819

19-
format:
20-
name: Format
20+
format_check:
21+
name: Checks Source Code Formatting
2122
runs-on: ubuntu-20.04
2223
steps:
2324
- name: Checkout Repository
24-
uses: actions/checkout@v2
25+
uses: actions/checkout@v3.2.0
2526

2627
- uses: Ortus-Solutions/[email protected]
2728
with:
28-
cmd: run-script format
29-
30-
- name: Commit Format Changes
31-
uses: stefanzweifel/git-auto-commit-action@v4
32-
with:
33-
commit_message: Apply cfformat changes
29+
cmd: run-script format:check

0 commit comments

Comments
 (0)