Skip to content

Commit c1b5bbd

Browse files
committed
chore(CI): Update for ColdBox 8, Lucee 7, and full BoxLang Prime support
1 parent 3f624f5 commit c1b5bbd

File tree

14 files changed

+107
-44
lines changed

14 files changed

+107
-44
lines changed

.github/workflows/cron.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,34 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@1", "boxlang-cfml@1"]
14+
cfengine: ["lucee@5", "lucee@6", "lucee@7", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
15+
coldbox: ["^6.0.0", "^7.0.0", "^8.0.0"]
1516
experimental: [ false ]
1617
include:
1718
- cfengine: "lucee@be"
19+
coldbox: "^6.0.0"
20+
experimental: true
21+
- cfengine: "lucee@be"
22+
coldbox: "^7.0.0"
23+
experimental: true
24+
- cfengine: "lucee@be"
25+
coldbox: "^8.0.0"
26+
experimental: true
27+
- cfengine: "adobe@be"
28+
coldbox: "^6.0.0"
29+
experimental: true
30+
- cfengine: "adobe@be"
31+
coldbox: "^7.0.0"
1832
experimental: true
1933
- cfengine: "adobe@be"
34+
coldbox: "^8.0.0"
2035
experimental: true
2136
- cfengine: "boxlang@be"
37+
coldbox: "^8.0.0"
2238
experimental: true
39+
- cfengine: "boxlang@1"
40+
coldbox: "^8.0.0"
41+
experimental: false
2342
steps:
2443
- name: Checkout Repository
2544
uses: actions/[email protected]
@@ -38,6 +57,7 @@ jobs:
3857
- name: Install dependencies
3958
run: |
4059
box install
60+
box install coldbox@{{ matrix.coldbox }} --noSave
4161
4262
- name: Start server
4363
run: |

.github/workflows/pr.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,34 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@1", "boxlang-cfml@1"]
22+
cfengine: ["lucee@5", "lucee@6", "lucee@7", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
23+
coldbox: ["^6.0.0", "^7.0.0", "^8.0.0"]
2324
experimental: [ false ]
2425
include:
2526
- cfengine: "lucee@be"
27+
coldbox: "^6.0.0"
28+
experimental: true
29+
- cfengine: "lucee@be"
30+
coldbox: "^7.0.0"
31+
experimental: true
32+
- cfengine: "lucee@be"
33+
coldbox: "^8.0.0"
34+
experimental: true
35+
- cfengine: "adobe@be"
36+
coldbox: "^6.0.0"
37+
experimental: true
38+
- cfengine: "adobe@be"
39+
coldbox: "^7.0.0"
2640
experimental: true
2741
- cfengine: "adobe@be"
42+
coldbox: "^8.0.0"
2843
experimental: true
2944
- cfengine: "boxlang@be"
45+
coldbox: "^8.0.0"
3046
experimental: true
47+
- cfengine: "boxlang@1"
48+
coldbox: "^8.0.0"
49+
experimental: false
3150
steps:
3251
- name: Checkout Repository
3352
uses: actions/[email protected]
@@ -46,6 +65,7 @@ jobs:
4665
- name: Install dependencies
4766
run: |
4867
box install
68+
box install coldbox@{{ matrix.coldbox }} --noSave
4969
5070
- name: Start server
5171
run: |

.github/workflows/release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang@1", "boxlang-cfml@1"]
17+
cfengine: ["lucee@5", "lucee@6", "lucee@7", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
18+
coldbox: ["^6.0.0", "^7.0.0", "^8.0.0"]
1819
experimental: [ false ]
20+
include:
21+
- cfengine: "boxlang@1"
22+
coldbox: "^8.0.0"
23+
experimental: false
1924
steps:
2025
- name: Checkout Repository
2126
uses: actions/[email protected]
@@ -34,6 +39,7 @@ jobs:
3439
- name: Install dependencies
3540
run: |
3641
box install
42+
box install coldbox@{{ matrix.coldbox }} --noSave
3743
3844
- name: Start server
3945
run: |

models/CfhttpHttpClient.cfc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,10 @@ component implements="HyperHttpClientInterface" {
254254
var queryParams = req.getQueryParams();
255255
for ( var param in queryParams ) {
256256
cfhttpparam(
257-
type = "url",
258-
name = param.name,
259-
value = param.value
257+
type = "url",
258+
name = param.name,
259+
value = param.value,
260+
encoded = true // this will be ignored by ACF, but used by Lucee and BoxLang (currently)
260261
);
261262
}
262263

models/HyperRequest.cfc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ component accessors="true" {
216216

217217
// This is overwritten by the HyperBuilder if WireBox exists.
218218
variables.interceptorService = {
219-
"processState" : function() {
219+
"announce" : function() {
220220
}
221221
};
222222

@@ -1096,15 +1096,15 @@ component accessors="true" {
10961096
for ( var callback in variables.requestCallbacks ) {
10971097
callback( this );
10981098
}
1099-
variables.interceptorService.processState( "onHyperRequest", { "request" : this } );
1099+
variables.interceptorService.announce( "onHyperRequest", { "request" : this } );
11001100

11011101
try {
11021102
var res = shouldFake() ? generateFakeRequest() : variables.httpClient.send( this );
11031103

11041104
for ( var callback in variables.responseCallbacks ) {
11051105
callback( res );
11061106
}
1107-
variables.interceptorService.processState(
1107+
variables.interceptorService.announce(
11081108
"onHyperResponse",
11091109
{
11101110
"response" : res,
@@ -1166,7 +1166,7 @@ component accessors="true" {
11661166
for ( var callback in variables.requestCallbacks ) {
11671167
callback( this );
11681168
}
1169-
variables.interceptorService.processState( "onHyperRequest", { "request" : this } );
1169+
variables.interceptorService.announce( "onHyperRequest", { "request" : this } );
11701170

11711171
return httpClient.debug( this );
11721172
}

[email protected]

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
"http":{
99
"port":"8500"
1010
},
11-
"rewrites": {
12-
"enable": true
11+
"rewrites":{
12+
"enable":true
1313
}
1414
},
15-
"JVM": {
16-
"heapSize": "1024",
17-
"javaVersion": "openjdk21_jre",
15+
"JVM":{
16+
"heapSize":"1024",
17+
"javaVersion":"openjdk21_jre",
1818
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
1919
},
20-
"openBrowser": false,
21-
"env": {},
22-
"scripts": {
23-
"onServerInitialInstall": "install bx-esapi,bx-compat-cfml"
20+
"openBrowser":false,
21+
"env":{},
22+
"scripts":{
23+
"onServerInitialInstall":"install bx-esapi,bx-compat-cfml"
2424
}
2525
}

[email protected]

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
"http":{
99
"port":"8500"
1010
},
11-
"rewrites": {
12-
"enable": true
11+
"rewrites":{
12+
"enable":true
1313
}
1414
},
15-
"JVM": {
16-
"heapSize": "1024",
17-
"javaVersion": "openjdk21_jre",
15+
"JVM":{
16+
"heapSize":"1024",
17+
"javaVersion":"openjdk21_jre",
1818
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
1919
},
20-
"openBrowser": false,
21-
"env": {},
22-
"scripts": {
23-
"onServerInitialInstall": "install bx-esapi"
20+
"openBrowser":false,
21+
"env":{},
22+
"scripts":{
23+
"onServerInitialInstall":"install bx-esapi"
2424
}
2525
}

[email protected]

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"name":"hyper-lucee@7",
3+
"app":{
4+
"serverHomeDirectory":".engine/lucee7",
5+
"cfengine":"lucee@7"
6+
},
7+
"web":{
8+
"http":{
9+
"port":"8500"
10+
},
11+
"rewrites":{
12+
"enable":"true"
13+
}
14+
},
15+
"openBrowser":"false"
16+
}

tests/Application.cfc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ component {
1212
this.mappings[ "/root" ] = rootPath;
1313
this.mappings[ "/hyper" ] = rootPath;
1414
this.mappings[ "/globber" ] = rootPath & "modules/globber";
15-
this.mappings[ "/testingModuleRoot" ] = listDeleteAt( rootPath, listLen( rootPath, '\/' ), "\/" );
15+
testingModuleRootMapping = listDeleteAt( rootPath, listLen( rootPath, '\/' ), "\/" );
16+
if ( left( testingModuleRootMapping, 1 ) != "/" ) {
17+
testingModuleRootMapping = "/" & testingModuleRootMapping;
18+
}
19+
this.mappings[ "/testingModuleRoot" ] = testingModuleRootMapping;
1620
this.mappings[ "/app" ] = testsPath & "resources/app";
1721
this.mappings[ "/coldbox" ] = testsPath & "resources/app/coldbox";
1822
this.mappings[ "/testbox" ] = rootPath & "/testbox";

tests/resources/app/config/Router.cfc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
component {
22

33
function configure() {
4-
// Set Full Rewrites
5-
setFullRewrites( false );
6-
7-
// Conventions based routing
84
route( ":handler/:action?" ).end();
95
}
106

0 commit comments

Comments
 (0)