Skip to content

Commit 3e8495d

Browse files
authored
Merge pull request #10 from coldbox-modules/add_boxlang_to_test_matrix
Add support for boxlang@1 in test matrix and create server configuration
2 parents 927d227 + 32ea70d commit 3e8495d

5 files changed

Lines changed: 45 additions & 8 deletions

File tree

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
formatCheck:
2121
name: Checks Source Code Formatting
22-
runs-on: ubuntu-20.04
22+
runs-on: ubuntu-22.04
2323
steps:
2424
- name: Checkout Repository
2525
uses: actions/checkout@v3

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
##########################################################################################
2727
build:
2828
name: Build & Publish
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-22.04
3030
steps:
3131
- name: Checkout Repository
3232
uses: actions/checkout@v4
@@ -128,7 +128,7 @@ jobs:
128128
prep_next_release:
129129
name: Prep Next Release
130130
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
131-
runs-on: ubuntu-20.04
131+
runs-on: ubuntu-22.04
132132
needs: [ build ]
133133
steps:
134134
# Checkout development

.github/workflows/snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
##########################################################################################
1919
format:
2020
name: Code Auto-Formatting
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-22.04
2222
steps:
2323
- uses: actions/checkout@v3
2424

.github/workflows/tests.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,25 @@ on:
1010
jobs:
1111
tests:
1212
name: Tests
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-22.04
1414
env:
1515
DB_USER: root
1616
DB_PASSWORD: root
1717
continue-on-error: ${{ matrix.experimental }}
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
cfengine: [ "lucee@5" ]
21+
cfengine: [ "lucee@5", "boxlang@1" ]
2222
coldboxVersion: [ "^6.0.0", "^7.0.0" ]
2323
experimental: [ false ]
2424
# Here we tests all engines against ColdBox@BE
2525
include:
2626
- coldboxVersion: "be"
2727
cfengine: "lucee@5"
2828
experimental: true
29+
- coldboxVersion: "be"
30+
cfengine: "boxlang@1"
31+
experimental: true
2932
steps:
3033
- name: Checkout Repository
3134
uses: actions/checkout@v3
@@ -105,7 +108,7 @@ jobs:
105108

106109
- name: Upload Test Results to Artifacts
107110
if: always()
108-
uses: actions/upload-artifact@v3
111+
uses: actions/upload-artifact@v4
109112
with:
110113
name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}
111114
path: |
@@ -118,7 +121,7 @@ jobs:
118121
119122
- name: Upload Debug Logs To Artifacts
120123
if: ${{ failure() }}
121-
uses: actions/upload-artifact@v3
124+
uses: actions/upload-artifact@v4
122125
with:
123126
name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }}
124127
path: |

server-boxlang@1.json

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
{
2+
"name":"cbstorages-boxlang@1",
3+
"app":{
4+
"serverHomeDirectory":".engine/boxlang",
5+
"cfengine":"boxlang@1"
6+
},
7+
"web":{
8+
"http":{
9+
"port":"60299"
10+
},
11+
"rewrites":{
12+
"enable": true
13+
},
14+
"webroot": "test-harness",
15+
"aliases":{
16+
"/moduleroot/cbSSO":"../"
17+
}
18+
},
19+
"JVM":{
20+
"heapSize":"768",
21+
"javaVersion":"openjdk21_jre",
22+
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888"
23+
},
24+
"openBrowser":"false",
25+
"cfconfig":{
26+
"file":".cfconfig.json"
27+
},
28+
"env":{
29+
"BOXLANG_DEBUG":true
30+
},
31+
"scripts":{
32+
"onServerInitialInstall":"install bx-esapi,bx-compat-cfml --noSave"
33+
}
34+
}

0 commit comments

Comments
 (0)