Skip to content

Boxlang Compat #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jclausen merged 8 commits into from
Oct 28, 2025
Merged

Boxlang Compat #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b2f166f
Start with new build matrix
elpete Oct 27, 2025
95000a9
Make continue-on-error not in the env section
elpete Oct 28, 2025
723ce0e
Update test matrix and fix name check for Parser classes
elpete Oct 28, 2025
edf1e3c
Fix structKeyExists check
elpete Oct 28, 2025
a23bada
Fix name check
elpete Oct 28, 2025
a13c444
Use Java 21
elpete Oct 28, 2025
9a2bb6f
Fix for BoxLang yaml parsing with bx-yaml
elpete Oct 28, 2025
a5cb28a
Format
elpete Oct 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 59 additions & 27 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,20 +22,58 @@ jobs:
strategy:
fail-fast: false
matrix:
cfengine: [ "lucee@5", "lucee@6", "adobe@2018", "adobe@2021" ]
cfengine: [ "lucee@5", "lucee@6" ,"adobe@2018", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1" ]
coldboxVersion: [ "^6.0.0", "^7.0.0", "^8.0.0" ]
experimental: [ false ]
include:
- cfengine: "boxlang@1"
- coldboxVersion: "^8.0.0"
cfengine: "boxlang@1"
experimental: false
- coldboxVersion: "be"
cfengine: "lucee@5"
experimental: true
- coldboxVersion: "be"
cfengine: "lucee@6"
experimental: true
- coldboxVersion: "be"
cfengine: "lucee@be"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2018"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2021"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2023"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2025"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@be"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang@1"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang@be"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang-cfml@1"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang-cfml@be"
experimental: true
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v5

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
distribution: "adopt"
java-version: "11"
distribution: "temurin"
java-version: 21

- name: Cache CommandBox Dependencies
uses: actions/cache@v4
Expand All @@ -46,28 +84,22 @@ jobs:
restore-keys: |
${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}

- name: Setup CommandBox
uses: elpete/setup-commandbox@v1.0.0

- name: Update Commandbox Boxlang Module
if: ${{ matrix.cfengine == 'boxlang@1' }}
run:
box install --force commandbox-boxlang
- name: Setup CommandBox CLI
uses: Ortus-Solutions/setup-commandbox@v2.0.1
with:
install: commandbox-boxlang

- name: Install Test Harness Dependencies
working-directory: ./test-harness
- name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
run: |
box install
cd test-harness
box package set dependencies.coldbox=${{ matrix.coldboxVersion }}
box install

- name: Start ${{ matrix.cfengine }} Server
working-directory: ./test-harness
run: |
echo "matrix.cfengine=${{ matrix.cfengine }}" > ./.env
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
# Install Adobe 2021 cfpm modules
if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
box run-script install:2021
fi
curl http://127.0.0.1:60299

- name: Run Tests
Expand Down Expand Up @@ -125,17 +157,17 @@ jobs:
build:
name: Build & Publish
needs: tests
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v5
with:
fetch-depth: 0

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
distribution: "adopt"
distribution: "temurin"
java-version: "11"

- name: Cache CommandBox Dependencies
Expand All @@ -147,10 +179,11 @@ jobs:
restore-keys: |
${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}

- name: Setup CommandBox
uses: elpete/setup-commandbox@v1.0.0
- name: Setup CommandBox CLI
uses: Ortus-Solutions/setup-commandbox@v2.0.1
with:
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
install: commandbox-docbox

- name: Setup Environment Variables For Build Process
id: current_version
Expand All @@ -167,7 +200,6 @@ jobs:

- name: Build ${{ env.MODULE_ID }}
run: |
box install commandbox-docbox
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}

- name: Upload Build Artifacts
Expand Down
96 changes: 64 additions & 32 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,50 +13,83 @@ on:
jobs:
tests:
name: Tests
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
env:
DB_USER: root
DB_PASSWORD: root
continue-on-error: ${{ matrix.experimental }}
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: true
fail-fast: false
matrix:
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
cfengine: [ "lucee@5", "lucee@6" ,"adobe@2018", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1" ]
coldboxVersion: [ "^6.0.0", "^7.0.0", "^8.0.0" ]
experimental: [ false ]
include:
- cfengine: "boxlang@1"
- coldboxVersion: "^8.0.0"
cfengine: "boxlang@1"
experimental: false
- coldboxVersion: "be"
cfengine: "lucee@5"
experimental: true
- coldboxVersion: "be"
cfengine: "lucee@6"
experimental: true
- coldboxVersion: "be"
cfengine: "lucee@be"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2018"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2021"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2023"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2025"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@be"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang@1"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang@be"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang-cfml@1"
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang-cfml@be"
experimental: true
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v5

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
distribution: "adopt"
java-version: "11"

- name: Setup CommandBox
uses: elpete/setup-commandbox@v1.0.0
distribution: "temurin"
java-version: 21

- name: Update Commandbox Boxlang Module
if: ${{ matrix.cfengine == 'boxlang@1' }}
run:
box install --force commandbox-boxlang
- name: Setup CommandBox CLI
uses: Ortus-Solutions/setup-commandbox@v2.0.1
with:
install: commandbox-boxlang

- name: Install Test Harness Dependencies
working-directory: ./test-harness
- name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
run: |
box install
cd test-harness
box package set dependencies.coldbox=${{ matrix.coldboxVersion }}
box install

- name: Start ${{ matrix.cfengine }} Server
working-directory: ./test-harness
run: |
echo "matrix.cfengine=${{ matrix.cfengine }}" > ./.env
box server start serverConfigFile="server-${{ matrix.cfengine }}.json" --noSaveSettings --debug
# Install Adobe 2021 cfpm modules
if [[ "${{ matrix.cfengine }}" == "adobe@2021" ]] ; then
box run-script install:2021
fi
curl http://127.0.0.1:60299

- name: Run Tests
Expand All @@ -81,22 +114,21 @@ jobs:

format:
name: Format
runs-on: ubuntu-24.04
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v5

- name: Setup Java
uses: actions/setup-java@v2
uses: actions/setup-java@v5
with:
distribution: "adopt"
distribution: "temurin"
java-version: "11"

- name: Set Up CommandBox
uses: elpete/setup-commandbox@v1.0.0

- name: Install CFFormat
run: box install commandbox-cfformat
- name: Setup CommandBox CLI
uses: Ortus-Solutions/setup-commandbox@v2.0.1
with:
install: commandbox-cfformat

- name: Run CFFormat
run: box run-script format
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.artifacts/**
.tmp/**
modules/

test-harness/.engine/**
test-harness/.env
Expand All @@ -11,6 +12,7 @@ test-harness/testbox/**
test-harness/logs/**
test-harness/modules/**
test-harness/tests/resources/petstore/test.yaml
.engine/**

# log files
logs/**
35 changes: 17 additions & 18 deletions ModuleConfig.cfc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
component {

// Module Properties
this.title = "ColdBox Swagger SDK";
this.author = "Ortus Solutions";
this.webURL = "https://www.ortussolutions.com";
this.description = "Swagger SDK Module";
this.version = "@build.version@+@build.number@";
this.viewParentLookup = true;
this.title = "ColdBox Swagger SDK";
this.author = "Ortus Solutions";
this.webURL = "https://www.ortussolutions.com";
this.description = "Swagger SDK Module";
this.version = "@build.version@+@build.number@";
this.viewParentLookup = true;
this.layoutParentLookup = true;
// Model Namespace
this.modelNamespace = "SwaggerSDK";
this.modelNamespace = "SwaggerSDK";
// CF Mapping
this.cfmapping = "SwaggerSDK";
this.cfmapping = "SwaggerSDK";
// Auto-map models
this.autoMapModels = false;
this.autoMapModels = false;
// Module Dependencies That Must Be Loaded First, use internal names or aliases
this.dependencies = [ "cbjavaloader" ];
this.dependencies = [ "cbjavaloader" ];

/**
* Configure App
Expand All @@ -33,14 +33,13 @@ component {
*/
function onLoad(){
// load jars
wirebox.getInstance( "loader@cbjavaloader" )
.appendPaths( variables.modulePath & "/lib" );
wirebox.getInstance( "loader@cbjavaloader" ).appendPaths( variables.modulePath & "/lib" );


/**
* Utilities
*
*/
* Utilities
*
*/

// Open API Util
binder
Expand All @@ -51,9 +50,9 @@ component {


/**
* Manual Instantiation Instances
*
*/
* Manual Instantiation Instances
*
*/

// models.OpenAPI.Document
binder
Expand Down
8 changes: 7 additions & 1 deletion box.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@
"*/.md"
],
"scripts":{
"toMaster":"recipe build/toMaster.boxr"
"toMaster":"recipe build/toMaster.boxr",
"format":"cfformat run models,test-harness/tests/resources/BaseOpenAPISpec.cfc,test-harness/tests/specs,ModuleConfig.cfc --overwrite",
"format:watch":"cfformat watch models,test-harness/tests/resources/BaseOpenAPISpec.cfc,test-harness/tests/specs,ModuleConfig.cfc ./.cfformat.json",
"format:check":"cfformat check models,test-harness/tests/resources/BaseOpenAPISpec.cfc,test-harness/tests/specs,ModuleConfig.cfc ./.cfformat.json",
},
"installPaths":{
"cbjavaloader":"modules/cbjavaloader/"
}
}
Loading