Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
lmajano committed Feb 10, 2024
2 parents ad38ea9 + ff1fa7d commit e199c38
Show file tree
Hide file tree
Showing 20 changed files with 578 additions and 238 deletions.
2 changes: 1 addition & 1 deletion .cfformat.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@
"struct.multiline.element_count": 2,
"struct.multiline.min_length": 40,
"tab_indent": true
}
}
3 changes: 3 additions & 0 deletions .github/CODE_OF_CONDUCT.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Code of Conduct

Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#code-of-conduct).
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/BUG_REPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Bug report
about: Create a report to help us improve
---

<!-- Thanks for reporting an issue! Please fill out the blanks below. -->

## What are the steps to reproduce this issue?

1.
2.
3.

## What happens?


## What were you expecting to happen?


## Any logs, error output, etc?


## Any other comments?


## What versions are you using?

**Operating System:**
**Package Version:**
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Feature Request
about: Request a new feature or enhancement
---

<!-- Thanks for taking the time to recommend a feature! Please fill out the form below -->

## Summary

<!-- High level description of what this feature is -->

## Detailed Description

<!-- Lets get into the weeds here -->

## Possible Implementation Ideas

<!-- If you already have some idea of how to implement this, this would be the place to put it -->
29 changes: 29 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Description

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.

**Please note that all PRs must have tests attached to them**

IMPORTANT: Please review the [CONTRIBUTING.md](../CONTRIBUTING.md) file for detailed contributing guidelines.

## Issues

All PRs must have an accompanied issue. Please make sure you created it and linked it here.

## Type of change

Please delete options that are not relevant.

- [ ] Bug Fix
- [ ] Improvement
- [ ] New Feature
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update

## Checklist

- [ ] My code follows the style guidelines of this project [cfformat](../.cfformat.json)
- [ ] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [ ] I have added tests that prove my fix is effective or that my feature works
- [ ] New and existing unit tests pass locally with my changes
3 changes: 3 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Security Policy

Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#security-vulnerabilities).
3 changes: 3 additions & 0 deletions .github/SUPPORT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Support & Help

Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#support-questions).
110 changes: 0 additions & 110 deletions .github/workflows/ci.yml

This file was deleted.

19 changes: 0 additions & 19 deletions .github/workflows/gh-release.yml

This file was deleted.

53 changes: 13 additions & 40 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,56 +6,29 @@ on:
- "main"
- "master"
- "development"
- "releases/v*"
pull_request:
branches:
- "releases/v*"
- development

jobs:
tests:
name: Tests
runs-on: ubuntu-20.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3

- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: "adopt"
java-version: "11"
uses: ./.github/workflows/tests.yml
secrets: inherit

- name: Setup CommandBox
uses: Ortus-Solutions/[email protected]

- name: Install Dependencies
run: |
box install
- name: Run Tests
run: |
# Create the CommandBox modules folder, for some reason it is not created
mkdir -p ~/.CommandBox/cfml/modules
# Link up the module so we can do testing!
box link --force
# Test
box task run taskfile=build/Build target="runTests"
- name: Failure Logs
if: failure()
run: cat `box system-log`

format:
name: Format
formatCheck:
name: Checks Source Code Formatting
runs-on: ubuntu-20.04
steps:
- name: Checkout Repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- uses: Ortus-Solutions/[email protected]
- name: Setup CommandBox CLI
uses: Ortus-Solutions/[email protected]
with:
cmd: run-script format
install: commandbox-cfformat
warmup: true

- name: Commit Format Changes
uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: Apply cfformat changes
- name: Run formatting rules
run: box run-script format:check
Loading

0 comments on commit e199c38

Please sign in to comment.