Skip to content

Commit f12e7c1

Browse files
committed
Merge branch 'development'
2 parents 262ec03 + e4305fc commit f12e7c1

File tree

168 files changed

+4325
-3551
lines changed

Some content is hidden

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

168 files changed

+4325
-3551
lines changed

.cfconfig.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"adminPassword" : "coldbox",
33
"ajaxDebugWindowEnabled": false,
4-
"debuggingEnabled": false,
4+
"debuggingEnabled": true,
55
"debuggingReportExecutionTimes": false,
66
"debuggingShowDatabase" : true,
77
"inspectTemplate":"once",
@@ -23,6 +23,10 @@
2323
}
2424
},
2525
"cacheDefaultObject": "default",
26+
"experimental" : {
27+
"ASTCapture": false,
28+
"compiler": "asm"
29+
},
2630
"datasources": {
2731
"coolblog": {
2832
"allowAlter":true,
@@ -40,7 +44,7 @@
4044
"class":"${DB_CLASS}",
4145
"dbdriver": "MySQL",
4246
"dsn":"jdbc:mysql://{host}:{port}/{database}",
43-
"custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false",
47+
"custom":"useUnicode=true&characterEncoding=UTF8&serverTimezone=UTC&useLegacyDatetimeCode=true&autoReconnect=true&useSSL=false&allowPublicKeyRetrieval=true",
4448
"host":"${DB_HOST:127.0.0.1}",
4549
"username": "${DB_USER}",
4650
"password": "${DB_PASSWORD}",

.github/workflows/cron.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Daily Test Run
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *' # Runs at 00:00 UTC every day
6+
7+
jobs:
8+
tests:
9+
uses: ./.github/workflows/tests.yml
10+
secrets: inherit

.github/workflows/lts.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@ jobs:
1818
##########################################################################################
1919
format:
2020
name: Code Auto-Formatting
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-24.04
2222
steps:
2323
- uses: actions/checkout@v4
2424

2525
- name: Auto-format
26-
uses: Ortus-Solutions/commandbox-action@v1.0.2
26+
uses: Ortus-Solutions/commandbox-action@v1.0.3
2727
with:
2828
cmd: run-script format
2929

3030
- name: Commit Format Changes
31-
uses: stefanzweifel/git-auto-commit-action@v4
31+
uses: stefanzweifel/git-auto-commit-action@v5
3232
with:
3333
commit_message: Apply cfformat changes
3434
push_options: --force

.github/workflows/pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919

2020
format_check:
2121
name: Checks Source Code Formatting
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-24.04
2323
steps:
2424
- name: Checkout Repository
25-
uses: actions/checkout@v4.2.0
25+
uses: actions/checkout@v4
2626

2727
- uses: Ortus-Solutions/commandbox-action@v1.0.2
2828
with:

.github/workflows/release.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
#############################################
3838
build:
3939
name: Build & Publish Release
40-
runs-on: ubuntu-20.04
40+
runs-on: ubuntu-24.04
4141
steps:
4242
- name: Checkout Repository
4343
uses: actions/checkout@v4
@@ -51,6 +51,7 @@ jobs:
5151
- name: Setup CommandBox
5252
uses: Ortus-Solutions/setup-commandbox@v2.0.1
5353
with:
54+
install: commandbox-boxlang
5455
forgeboxAPIKey: ${{ secrets.FORGEBOX_API_TOKEN }}
5556

5657
- name: Setup Environment Variables For Build Process
@@ -195,9 +196,11 @@ jobs:
195196

196197
- name: Copy Changelog
197198
run: |
198-
cp .tmp/changelog.md changelog.md
199+
ls -lR .tmp/
200+
cp .tmp/changelog.md changelog.md || true
199201
200202
- name: Bump Version
203+
if: ${{ always() }}
201204
run: |
202205
if [ $LTS == 'true' ]
203206
then
@@ -209,6 +212,7 @@ jobs:
209212
210213
- name: Commit Version Bump
211214
uses: EndBug/add-and-commit@v9.1.4
215+
if: ${{ always() }}
212216
with:
213217
author_name: Github Actions
214218
author_email: info@ortussolutions.com

.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
##########################################################################################
2626
format:
2727
name: Code Auto-Formatting
28-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-24.04
2929
steps:
3030
- uses: actions/checkout@v4
3131

.github/workflows/tests.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,26 @@ on:
1111
jobs:
1212
tests:
1313
name: Test Suites
14-
runs-on: ubuntu-20.04
14+
runs-on: ubuntu-24.04
15+
timeout-minutes: ${{ matrix.timeoutMinutes }}
1516
env:
1617
DB_USER: root
1718
DB_PASSWORD: root
1819
continue-on-error: ${{ matrix.experimental }}
1920
strategy:
2021
fail-fast: false
2122
matrix:
22-
commandbox_version: [ "6.0.1" ]
23-
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
24-
jdkVersion: [ "11" ]
23+
commandbox_version: [ "6.2.0" ]
24+
cfengine: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
25+
jdkVersion: [ "21" ]
2526
experimental: [false]
27+
timeoutMinutes: [ 8 ]
2628
include:
27-
- cfengine: "lucee@6"
28-
jdkVersion: "17"
29-
commandbox_version: "6.0.1"
29+
- cfengine: "adobe@2025"
30+
jdkVersion: "21"
31+
commandbox_version: "6.2.0"
3032
experimental: true
31-
- cfengine: "adobe@2023"
32-
jdkVersion: "17"
33-
commandbox_version: "6.0.1"
34-
experimental: false
33+
timeoutMinutes: 8
3534
steps:
3635
- name: Checkout Repository
3736
uses: actions/checkout@v4
@@ -52,6 +51,7 @@ jobs:
5251
uses: Ortus-Solutions/setup-commandbox@v2.0.1
5352
with:
5453
version: ${{ matrix.commandbox_version }}
54+
install: commandbox-boxlang
5555

5656
- name: Setup .env For Runner
5757
run: |
@@ -68,7 +68,7 @@ jobs:
6868
- name: Install Dependencies
6969
run: |
7070
# Core dependencies
71-
box install
71+
box install --verbose
7272
7373
- name: Start ${{ matrix.cfengine }} Server
7474
run: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ test-harness/config/runtime.properties.cfm
3939
.env
4040
/settings.xml
4141
/.settings/
42+
grapher/data/**

box-cachebox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"*/.md"
2626
],
2727
"dependencies":{
28-
"cbproxies":"^1.0.1+13"
28+
"cbproxies":"^1"
2929
},
3030
"installPaths":{
3131
"cbproxies":"system/async/cbproxies/"

box-logbox.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"*/.md"
2626
],
2727
"dependencies":{
28-
"cbproxies":"^1.0.1+13"
28+
"cbproxies":"^1"
2929
},
3030
"installPaths":{
3131
"cbproxies":"system/async/cbproxies/"

0 commit comments

Comments
 (0)