Skip to content

Commit aaf93ad

Browse files
elpeteelpete
authored
chore: Update to latest qb and cbMockData (#42)
Update to qb 12 and cbMockData 4 BREAKING CHANGE: This update includes major library updates. This shouldn't have any breaking functionality, but it is being treated as a breaking change to communicate the major library updates.
1 parent 1c9263b commit aaf93ad

17 files changed

+321
-159
lines changed

‎.github/workflows/cron.yml‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,22 @@ jobs:
99
runs-on: ubuntu-latest
1010
name: Tests
1111
strategy:
12+
fail-fast: false
1213
matrix:
13-
cfengine: ["lucee@5", "lucee@be", "adobe@2018", "adobe@2021", "adobe@2023", "adobe@be"]
14+
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
15+
experimental: [false]
1416
coldbox: ["coldbox@6", "coldbox@7", "coldbox@be"]
15-
javaVersion: ["openjdk8", "openjdk11"]
17+
include:
18+
- cfengine: "lucee@be"
19+
experimental: true
20+
- cfengine: "adobe@be"
21+
experimental: true
22+
- cfengine: "boxlang@1"
23+
experimental: true
24+
- cfengine: "boxlang@be"
25+
experimental: true
26+
- cfengine: "boxlang-cfml@be"
27+
experimental: true
1628
services:
1729
postgres:
1830
image: postgres:12
@@ -29,15 +41,19 @@ jobs:
2941
--health-retries 5
3042
steps:
3143
- name: Checkout Repository
32-
uses: actions/checkout@v2
44+
uses: actions/checkout@v4
3345

3446
- name: Setup Java JDK
35-
uses: actions/setup-java@v1.4.3
47+
uses: actions/setup-java@v4
3648
with:
37-
java-version: 11
49+
distribution: 'zulu'
50+
java-version: 21
3851

39-
- name: Set Up CommandBox
40-
uses: elpete/[email protected]
52+
- name: Setup CommandBox CLI
53+
uses: Ortus-Solutions/[email protected]
54+
with:
55+
installSystemModules: true
56+
install: commandbox-boxlang
4157

4258
- name: Initial Server Start (so lex extensions are picked up)
4359
env:
@@ -48,17 +64,12 @@ jobs:
4864
DB_PASSWORD: cfmigrations_testing
4965
run: |
5066
box config set modules.commandbox-dotenv.checkEnvPreServerStart=false
51-
box server start cfengine=${{ matrix.cfengine }}
67+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
5268
sleep 30
5369
54-
- name: CFPM
55-
if: ${{ matrix.cfengine == 'adobe@2021' || matrix.cfengine == 'adobe@2023' }}
56-
run: |
57-
box run-script install:cfpm
58-
5970
- name: Install dependencies
6071
run: |
61-
box install
72+
box install --verbose
6273
box install ${{ matrix.coldbox }} --noSave
6374
6475
- name: Restart server (so extensions are picked up)
@@ -69,7 +80,7 @@ jobs:
6980
DB_USER: cfmigrations_testing
7081
DB_PASSWORD: cfmigrations_testing
7182
run: |
72-
box server restart
83+
box server restart serverConfigFile="server-${{ matrix.cfengine }}.json" --debug
7384
sleep 30
7485
7586
- name: Run TestBox Tests
@@ -79,4 +90,5 @@ jobs:
7990
DB_NAME: cfmigrations_testing
8091
DB_USER: cfmigrations_testing
8192
DB_PASSWORD: cfmigrations_testing
93+
continue-on-error: ${{ matrix.experimental }}
8294
run: box testbox run

‎.github/workflows/pr.yml‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,20 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
cfengine: ["lucee@5", "adobe@2018", "adobe@2021", "adobe@2023"]
22+
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
23+
experimental: [ false ]
2324
coldbox: ["coldbox@6", "coldbox@7"]
25+
include:
26+
- cfengine: "lucee@be"
27+
experimental: true
28+
- cfengine: "adobe@be"
29+
experimental: true
30+
- cfengine: "boxlang@1"
31+
experimental: true
32+
- cfengine: "boxlang@be"
33+
experimental: true
34+
- cfengine: "boxlang-cfml@be"
35+
experimental: true
2436
services:
2537
postgres:
2638
image: postgres:12
@@ -37,15 +49,19 @@ jobs:
3749
--health-retries 5
3850
steps:
3951
- name: Checkout Repository
40-
uses: actions/checkout@v2
52+
uses: actions/checkout@v4
4153

4254
- name: Setup Java JDK
43-
uses: actions/setup-java@v1.4.3
55+
uses: actions/setup-java@v4
4456
with:
45-
java-version: 11
57+
distribution: 'zulu'
58+
java-version: 21
4659

47-
- name: Set Up CommandBox
48-
uses: elpete/[email protected]
60+
- name: Setup CommandBox CLI
61+
uses: Ortus-Solutions/[email protected]
62+
with:
63+
installSystemModules: true
64+
install: commandbox-boxlang
4965

5066
- name: Initial Server Start (so lex extensions are picked up)
5167
env:
@@ -56,14 +72,9 @@ jobs:
5672
DB_PASSWORD: cfmigrations_testing
5773
run: |
5874
box config set modules.commandbox-dotenv.checkEnvPreServerStart=false
59-
box server start cfengine=${{ matrix.cfengine }}
75+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
6076
sleep 30
6177
62-
- name: CFPM
63-
if: ${{ matrix.cfengine == 'adobe@2021' || matrix.cfengine == 'adobe@2023' }}
64-
run: |
65-
box run-script install:cfpm
66-
6778
- name: Install dependencies
6879
run: |
6980
box install --verbose
@@ -77,7 +88,7 @@ jobs:
7788
DB_USER: cfmigrations_testing
7889
DB_PASSWORD: cfmigrations_testing
7990
run: |
80-
box server restart
91+
box server restart serverConfigFile="server-${{ matrix.cfengine }}.json" --debug
8192
sleep 30
8293
8394
- name: Run TestBox Tests
@@ -87,6 +98,7 @@ jobs:
8798
DB_NAME: cfmigrations_testing
8899
DB_USER: cfmigrations_testing
89100
DB_PASSWORD: cfmigrations_testing
101+
continue-on-error: ${{ matrix.experimental }}
90102
run: box testbox run
91103

92104
format:

‎.github/workflows/prerelease.yml‎

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

‎.github/workflows/release.yml‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ jobs:
1414
strategy:
1515
fail-fast: true
1616
matrix:
17-
cfengine: ["lucee@5", "adobe@2018", "adobe@2021", "adobe@2023"]
17+
cfengine: ["lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1"]
18+
experimental: [false]
1819
coldbox: ["coldbox@6", "coldbox@7"]
1920
services:
2021
postgres:
@@ -34,13 +35,20 @@ jobs:
3435
- name: Checkout Repository
3536
uses: actions/checkout@v2
3637

38+
- name: Checkout Repository
39+
uses: actions/checkout@v4
40+
3741
- name: Setup Java JDK
38-
uses: actions/setup-java@v1.4.3
42+
uses: actions/setup-java@v4
3943
with:
40-
java-version: 11
44+
distribution: 'zulu'
45+
java-version: 21
4146

42-
- name: Set Up CommandBox
43-
uses: elpete/[email protected]
47+
- name: Setup CommandBox CLI
48+
uses: Ortus-Solutions/[email protected]
49+
with:
50+
installSystemModules: true
51+
install: commandbox-boxlang
4452

4553
- name: Initial Server Start (so lex extensions are picked up)
4654
env:
@@ -51,14 +59,9 @@ jobs:
5159
DB_PASSWORD: cfmigrations_testing
5260
run: |
5361
box config set modules.commandbox-dotenv.checkEnvPreServerStart=false
54-
box server start cfengine=${{ matrix.cfengine }}
62+
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
5563
sleep 30
5664
57-
- name: CFPM
58-
if: ${{ matrix.cfengine == 'adobe@2021' || matrix.cfengine == 'adobe@2023' }}
59-
run: |
60-
box run-script install:cfpm
61-
6265
- name: Install dependencies
6366
run: |
6467
box install
@@ -72,7 +75,7 @@ jobs:
7275
DB_USER: cfmigrations_testing
7376
DB_PASSWORD: cfmigrations_testing
7477
run: |
75-
box server restart
78+
box server restart serverConfigFile="server-${{ matrix.cfengine }}.json" --debug
7679
sleep 30
7780
7881
- name: Run TestBox Tests

‎box.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
}
3434
],
3535
"dependencies":{
36-
"qb":"^10.0.0",
37-
"mockdatacfc":"^3.4.0+35"
36+
"qb":"^12.0.0",
37+
"cbMockData":"^4.1.0"
3838
},
3939
"installPaths":{
4040
"qb":"modules/qb/",

‎models/QBMigrationManager.cfc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
component accessors="true" {
22

33
property name="wirebox" inject="wirebox";
4-
property name="mockData" inject="MockData@mockdatacfc";
4+
property name="mockData" inject="MockData@cbMockData";
55
property name="defaultGrammar" default="AutoDiscover@qb";
66
property name="datasource";
77
property name="migrationsTable" default="cfmigrations";

‎[email protected]‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"name":"cfmigrations-adobe@2021",
3+
"app":{
4+
"serverHomeDirectory":".engine/adobe2021",
5+
"cfengine":"adobe@2021"
6+
},
7+
"web":{
8+
"http":{
9+
"port":"60299"
10+
},
11+
"rewrites":{
12+
"enable":"true"
13+
}
14+
},
15+
"jvm":{
16+
"heapSize":"1024",
17+
"javaVersion":"openjdk11_jre",
18+
"args": [
19+
"-Dcoldfusion.runtime.remotemethod.matchArguments=false"
20+
]
21+
},
22+
"openBrowser":"false",
23+
"scripts":{
24+
"onServerInstall":"cfpm install zip,debugger,postgresql"
25+
}
26+
}

0 commit comments

Comments
 (0)