Skip to content

Commit 32d096b

Browse files
committed
Merge branch 'development'
2 parents 9bc46a4 + fef0d41 commit 32d096b

Some content is hidden

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

65 files changed

+2564
-1023
lines changed

.DS_Store

6 KB
Binary file not shown.

.cfconfig.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"adminPassword" : "coldbox",
3-
"debuggingEnabled":true,
3+
"debuggingDBEnabled":"true",
4+
"debuggingEnabled":"true",
5+
"debuggingShowDatabase" : true,
46
"debuggingReportExecutionTimes":false,
57
"disableInternalCFJavaComponents":false,
68
"inspectTemplate":"always",

.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).
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:**
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: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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+
## Issues
10+
11+
All PRs must have an accompanied issue. Please make sure you created it and linked it here.
12+
13+
## Type of change
14+
15+
Please delete options that are not relevant.
16+
17+
- [ ] Bug Fix
18+
- [ ] Improvement
19+
- [ ] New Feature
20+
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
21+
- [ ] This change requires a documentation update
22+
23+
## Checklist
24+
25+
- [ ] My code follows the style guidelines of this project [cfformat](../.cfformat.json)
26+
- [ ] I have commented my code, particularly in hard-to-understand areas
27+
- [ ] I have made corresponding changes to the documentation
28+
- [ ] I have added tests that prove my fix is effective or that my feature works
29+
- [ ] 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/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-20.04
2323
steps:
2424
- name: Checkout Repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- uses: Ortus-Solutions/[email protected]
2828
with:

.github/workflows/release.yml

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ jobs:
2929
runs-on: ubuntu-20.04
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Setup nodejs
35-
uses: actions/setup-node@v2
35+
uses: actions/setup-node@v4
3636
with:
37-
node-version: 16.x
37+
node-version: 18.x
3838

3939
- name: Setup CommandBox
4040
uses: Ortus-Solutions/[email protected]
@@ -63,15 +63,16 @@ jobs:
6363

6464
- name: Build ${{ env.MODULE_ID }}
6565
run: |
66-
npm i npm@latest -g
6766
npm install
6867
npm run prod
6968
rm -Rf node_modules
69+
npm install -g markdownlint-cli
70+
markdownlint changelog.md --fix
7071
box install commandbox-docbox
7172
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
7273
7374
- name: Commit Changelog To Master
74-
uses: EndBug/[email protected].1
75+
uses: EndBug/[email protected].3
7576
if: env.SNAPSHOT == 'false'
7677
with:
7778
author_name: Github Actions
@@ -80,7 +81,7 @@ jobs:
8081
add: changelog.md
8182

8283
- name: Tag Version
83-
uses: rickstaa/action-create-tag@v1.6.1
84+
uses: rickstaa/action-create-tag@v1.7.2
8485
if: env.SNAPSHOT == 'false'
8586
with:
8687
tag: "v${{ env.VERSION }}"
@@ -89,19 +90,43 @@ jobs:
8990

9091
- name: Upload Build Artifacts
9192
if: success()
92-
uses: actions/upload-artifact@v3
93+
uses: actions/upload-artifact@v4
9394
with:
9495
name: ${{ env.MODULE_ID }}
9596
path: |
9697
.artifacts/**/*
9798
changelog.md
9899
100+
- name: Upload Binaries to S3
101+
uses: jakejarvis/s3-sync-action@master
102+
with:
103+
args: --acl public-read
104+
env:
105+
AWS_S3_BUCKET: "downloads.ortussolutions.com"
106+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
107+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
108+
SOURCE_DIR: ".artifacts/${{ env.MODULE_ID }}"
109+
DEST_DIR: "ortussolutions/coldbox-modules/${{ env.MODULE_ID }}"
110+
111+
- name: Upload API Docs to S3
112+
uses: jakejarvis/s3-sync-action@master
113+
with:
114+
args: --acl public-read
115+
env:
116+
AWS_S3_BUCKET: "apidocs.ortussolutions.com"
117+
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
118+
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_ACCESS_SECRET }}
119+
SOURCE_DIR: ".tmp/apidocs"
120+
DEST_DIR: "coldbox-modules/${{ env.MODULE_ID }}/${{ env.VERSION }}"
121+
99122
- name: Publish To ForgeBox
100123
run: |
101-
cd .tmp/${{ env.MODULE_ID }} && box forgebox publish --force
124+
cd .tmp/${{ env.MODULE_ID }}
125+
cat box.json
126+
box forgebox publish --force
102127
103128
- name: Create Github Release
104-
uses: taiki-e/create-gh-release-action@v1.6.2
129+
uses: taiki-e/create-gh-release-action@v1.8.0
105130
continue-on-error: true
106131
if: env.SNAPSHOT == 'false'
107132
with:
@@ -121,7 +146,7 @@ jobs:
121146
steps:
122147
# Checkout development
123148
- name: Checkout Repository
124-
uses: actions/checkout@v3
149+
uses: actions/checkout@v4
125150
with:
126151
ref: development
127152

@@ -131,7 +156,7 @@ jobs:
131156
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
132157

133158
- name: Download build artifacts
134-
uses: actions/download-artifact@v2
159+
uses: actions/download-artifact@v4
135160
with:
136161
name: ${{ env.MODULE_ID }}
137162
path: .tmp
@@ -148,7 +173,7 @@ jobs:
148173
149174
# Commit it back to development
150175
- name: Commit Version Bump
151-
uses: EndBug/[email protected].1
176+
uses: EndBug/[email protected].3
152177
with:
153178
author_name: Github Actions
154179
author_email: [email protected]

0 commit comments

Comments
 (0)