Skip to content

Commit d425e98

Browse files
jclausenjclausen
authored
Merge pull request #25 from coldbox-modules/development
v3.5.0
2 parents 0b65b48 + 5ed98e3 commit d425e98

27 files changed

+977
-659
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 70 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
branches:
77
- development
88
- master
9+
workflow_dispatch:
910

1011
env:
1112
MODULE_ID: swagger-sdk
@@ -16,47 +17,86 @@ jobs:
1617
#############################################
1718
tests:
1819
name: Tests
19-
runs-on: ubuntu-20.04
20+
runs-on: ubuntu-24.04
21+
continue-on-error: ${{ matrix.experimental }}
2022
strategy:
2123
fail-fast: false
2224
matrix:
23-
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
25+
cfengine: [ "lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1" ]
26+
coldboxVersion: [ "^7.0.0", "^8.0.0" ]
27+
experimental: [ false ]
28+
include:
29+
- coldboxVersion: "^8.0.0"
30+
cfengine: "boxlang@1"
31+
experimental: false
32+
- coldboxVersion: "be"
33+
cfengine: "lucee@5"
34+
experimental: true
35+
- coldboxVersion: "be"
36+
cfengine: "lucee@6"
37+
experimental: true
38+
- coldboxVersion: "be"
39+
cfengine: "lucee@be"
40+
experimental: true
41+
- coldboxVersion: "be"
42+
cfengine: "adobe@2021"
43+
experimental: true
44+
- coldboxVersion: "be"
45+
cfengine: "adobe@2023"
46+
experimental: true
47+
- coldboxVersion: "be"
48+
cfengine: "adobe@2025"
49+
experimental: true
50+
- coldboxVersion: "be"
51+
cfengine: "adobe@be"
52+
experimental: true
53+
- coldboxVersion: "be"
54+
cfengine: "boxlang@1"
55+
experimental: true
56+
- coldboxVersion: "be"
57+
cfengine: "boxlang@be"
58+
experimental: true
59+
- coldboxVersion: "be"
60+
cfengine: "boxlang-cfml@1"
61+
experimental: true
62+
- coldboxVersion: "be"
63+
cfengine: "boxlang-cfml@be"
64+
experimental: true
2465
steps:
2566
- name: Checkout Repository
26-
uses: actions/checkout@v2
67+
uses: actions/checkout@v5
2768

2869
- name: Setup Java
29-
uses: actions/setup-java@v2
70+
uses: actions/setup-java@v5
3071
with:
31-
distribution: "adopt"
32-
java-version: "11"
72+
distribution: "temurin"
73+
java-version: 21
3374

3475
- name: Cache CommandBox Dependencies
35-
uses: actions/cache@v1
76+
uses: actions/cache@v4
3677
if: ${{ true }}
3778
with:
3879
path: ~/.CommandBox/artifacts
3980
key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
4081
restore-keys: |
4182
${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
4283
43-
- name: Setup CommandBox
44-
uses: elpete/[email protected]
84+
- name: Setup CommandBox CLI
85+
uses: Ortus-Solutions/[email protected]
86+
with:
87+
install: commandbox-boxlang
4588

46-
- name: Install Test Harness Dependencies
47-
working-directory: ./test-harness
89+
- name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
4890
run: |
4991
box install
92+
cd test-harness
93+
box package set dependencies.coldbox=${{ matrix.coldboxVersion }}
94+
box install
5095
5196
- name: Start ${{ matrix.cfengine }} Server
52-
working-directory: ./test-harness
5397
run: |
5498
echo "matrix.cfengine=${{ matrix.cfengine }}" > ./.env
5599
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
56-
# Install Adobe 2021 cfpm modules
57-
if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
58-
box run-script install:2021
59-
fi
60100
curl http://127.0.0.1:60299
61101
62102
- name: Run Tests
@@ -67,17 +107,17 @@ jobs:
67107
box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit
68108
69109
- name: Publish Test Results
70-
uses: EnricoMi/publish-unit-test-result-action@v1
110+
uses: EnricoMi/publish-unit-test-result-action@v2
71111
if: always()
72112
with:
73113
files: test-harness/tests/results/**/*.xml
74114
check_name: "${{ matrix.cfengine }} Test Results"
75115

76116
- name: Upload Test Results Artifacts
77117
if: always()
78-
uses: actions/upload-artifact@v2
118+
uses: actions/upload-artifact@v4
79119
with:
80-
name: test-results-${{ matrix.cfengine }}
120+
name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}-${{ matrix.experimental }}
81121
path: |
82122
test-harness/tests/results/**/*
83123
@@ -101,7 +141,7 @@ jobs:
101141
102142
- name: Upload Debugging Info To Artifacts
103143
if: ${{ failure() }}
104-
uses: actions/upload-artifact@v2
144+
uses: actions/upload-artifact@v4
105145
with:
106146
name: Failure Debugging Info - ${{ matrix.cfengine }}
107147
path: |
@@ -114,39 +154,40 @@ jobs:
114154
build:
115155
name: Build & Publish
116156
needs: tests
117-
runs-on: ubuntu-20.04
157+
runs-on: ubuntu-latest
118158
steps:
119159
- name: Checkout Repository
120-
uses: actions/checkout@v2
160+
uses: actions/checkout@v5
121161
with:
122162
fetch-depth: 0
123163

124164
- name: Setup Java
125-
uses: actions/setup-java@v2
165+
uses: actions/setup-java@v5
126166
with:
127-
distribution: "adopt"
167+
distribution: "temurin"
128168
java-version: "11"
129169

130170
- name: Cache CommandBox Dependencies
131-
uses: actions/cache@v1
171+
uses: actions/cache@v4
132172
if: ${{ true }}
133173
with:
134174
path: ~/.CommandBox/artifacts
135175
key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
136176
restore-keys: |
137177
${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
138178
139-
- name: Setup CommandBox
140-
uses: elpete/setup-commandbox@v1.0.0
179+
- name: Setup CommandBox CLI
180+
uses: Ortus-Solutions/setup-commandbox@v2.0.1
141181
with:
142182
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
183+
install: commandbox-docbox
143184

144185
- name: Setup Environment Variables For Build Process
145186
id: current_version
146187
run: |
147188
echo "VERSION=`cat box.json | jq '.version' -r`" >> $GITHUB_ENV
148189
box package set [email protected]@[email protected]@
149-
# master or snapshot
190+
# master or snapshotgit
150191
echo "Github Ref is $GITHUB_REF"
151192
echo "BRANCH=master" >> $GITHUB_ENV
152193
if [ $GITHUB_REF == 'refs/heads/development' ]
@@ -156,12 +197,11 @@ jobs:
156197
157198
- name: Build ${{ env.MODULE_ID }}
158199
run: |
159-
box install commandbox-docbox
160200
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
161201
162202
- name: Upload Build Artifacts
163203
if: success()
164-
uses: actions/upload-artifact@v2
204+
uses: actions/upload-artifact@v4
165205
with:
166206
name: ${{ env.MODULE_ID }}
167207
path: |

‎.github/workflows/pr.yml‎

Lines changed: 69 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,41 +13,83 @@ on:
1313
jobs:
1414
tests:
1515
name: Tests
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-latest
1717
env:
1818
DB_USER: root
1919
DB_PASSWORD: root
20+
continue-on-error: ${{ matrix.experimental }}
2021
strategy:
21-
fail-fast: true
22+
fail-fast: false
2223
matrix:
23-
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
24+
cfengine: [ "lucee@5", "lucee@6" , "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1" ]
25+
coldboxVersion: [ "^7.0.0", "^8.0.0" ]
26+
experimental: [ false ]
27+
include:
28+
- coldboxVersion: "^8.0.0"
29+
cfengine: "boxlang@1"
30+
experimental: false
31+
- coldboxVersion: "be"
32+
cfengine: "lucee@5"
33+
experimental: true
34+
- coldboxVersion: "be"
35+
cfengine: "lucee@6"
36+
experimental: true
37+
- coldboxVersion: "be"
38+
cfengine: "lucee@be"
39+
experimental: true
40+
- coldboxVersion: "be"
41+
cfengine: "adobe@2018"
42+
experimental: true
43+
- coldboxVersion: "be"
44+
cfengine: "adobe@2021"
45+
experimental: true
46+
- coldboxVersion: "be"
47+
cfengine: "adobe@2023"
48+
experimental: true
49+
- coldboxVersion: "be"
50+
cfengine: "adobe@2025"
51+
experimental: true
52+
- coldboxVersion: "be"
53+
cfengine: "adobe@be"
54+
experimental: true
55+
- coldboxVersion: "be"
56+
cfengine: "boxlang@1"
57+
experimental: true
58+
- coldboxVersion: "be"
59+
cfengine: "boxlang@be"
60+
experimental: true
61+
- coldboxVersion: "be"
62+
cfengine: "boxlang-cfml@1"
63+
experimental: true
64+
- coldboxVersion: "be"
65+
cfengine: "boxlang-cfml@be"
66+
experimental: true
2467
steps:
2568
- name: Checkout Repository
26-
uses: actions/checkout@v2
69+
uses: actions/checkout@v5
2770

2871
- name: Setup Java
29-
uses: actions/setup-java@v2
72+
uses: actions/setup-java@v5
3073
with:
31-
distribution: "adopt"
32-
java-version: "11"
74+
distribution: "temurin"
75+
java-version: 21
3376

34-
- name: Setup CommandBox
35-
uses: elpete/[email protected]
77+
- name: Setup CommandBox CLI
78+
uses: Ortus-Solutions/[email protected]
79+
with:
80+
install: commandbox-boxlang
3681

37-
- name: Install Test Harness Dependencies
38-
working-directory: ./test-harness
82+
- name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
3983
run: |
4084
box install
85+
cd test-harness
86+
box package set dependencies.coldbox=${{ matrix.coldboxVersion }}
87+
box install
4188
4289
- name: Start ${{ matrix.cfengine }} Server
43-
working-directory: ./test-harness
4490
run: |
4591
echo "matrix.cfengine=${{ matrix.cfengine }}" > ./.env
4692
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
47-
# Install Adobe 2021 cfpm modules
48-
if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
49-
box run-script install:2021
50-
fi
5193
curl http://127.0.0.1:60299
5294
5395
- name: Run Tests
@@ -58,11 +100,11 @@ jobs:
58100
box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit
59101
60102
- name: Publish PR Test Reports
61-
uses: mikepenz/action-junit-report@v2
103+
uses: EnricoMi/publish-unit-test-result-action@v2
104+
if: always()
62105
with:
63-
report_paths: 'test-harness/tests/results/**/*.xml'
106+
files: test-harness/tests/results/**/*.xml
64107
check_name: "${{ matrix.cfengine }} Test Results"
65-
summary: true
66108

67109
- name: Failure Debugging Info
68110
if: ${{ failure() }}
@@ -72,22 +114,21 @@ jobs:
72114
73115
format:
74116
name: Format
75-
runs-on: ubuntu-20.04
117+
runs-on: ubuntu-latest
76118
steps:
77119
- name: Checkout Repository
78-
uses: actions/checkout@v2
120+
uses: actions/checkout@v5
79121

80122
- name: Setup Java
81-
uses: actions/setup-java@v2
123+
uses: actions/setup-java@v5
82124
with:
83-
distribution: "adopt"
125+
distribution: "temurin"
84126
java-version: "11"
85127

86-
- name: Set Up CommandBox
87-
uses: elpete/[email protected]
88-
89-
- name: Install CFFormat
90-
run: box install commandbox-cfformat
128+
- name: Setup CommandBox CLI
129+
uses: Ortus-Solutions/[email protected]
130+
with:
131+
install: commandbox-cfformat
91132

92133
- name: Run CFFormat
93134
run: box run-script format

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
.artifacts/**
44
.tmp/**
5+
modules/
56

67
test-harness/.engine/**
78
test-harness/.env
@@ -11,6 +12,7 @@ test-harness/testbox/**
1112
test-harness/logs/**
1213
test-harness/modules/**
1314
test-harness/tests/resources/petstore/test.yaml
15+
.engine/**
1416

1517
# log files
1618
logs/**

0 commit comments

Comments
 (0)