Skip to content

v3.5.0 #25

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 24 commits into from
Oct 28, 2025
Merged

v3.5.0 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ed08570
bump patch [ci skip]
jclausen May 30, 2024
87b12fb
changelog update [ci skip]
jclausen May 30, 2024
ddcd630
add null key value handling
jclausen Nov 1, 2024
d8fa998
add Lucee 6 to matrix
jclausen Nov 1, 2024
c12f8ac
add 6 json
jclausen Nov 1, 2024
86f5c1e
update old actions
jclausen Nov 1, 2024
48fb92d
add boxlang to matrix
otisnado Feb 5, 2025
22bb32b
enable workflow dispatch for triggering boxlang tests and use ubuntu-…
otisnado Feb 5, 2025
f35cb57
Fixes for Lucee 6
elpete Feb 13, 2025
92deeaf
Add back in $extend
elpete Feb 16, 2025
eeb99ee
Revert parser changes
elpete Oct 27, 2025
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
5a24e33
Merge pull request #24 from coldbox-modules/boxlang_compat
jclausen Oct 28, 2025
a058563
fix artifact naming
jclausen Oct 28, 2025
da9676b
drop support for ACF 2018 and Coldbox 6
jclausen Oct 28, 2025
c4cdd63
bump to minor [ci skip]
jclausen Oct 28, 2025
5ed98e3
more removal of 2018 and Coldbox 6
jclausen 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
100 changes: 70 additions & 30 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ on:
branches:
- development
- master
workflow_dispatch:

env:
MODULE_ID: swagger-sdk
Expand All @@ -16,47 +17,86 @@ jobs:
#############################################
tests:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
cfengine: [ "lucee@5", "lucee@6", "adobe@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1" ]
coldboxVersion: [ "^7.0.0", "^8.0.0" ]
experimental: [ false ]
include:
- 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@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@v1
uses: actions/cache@v4
if: ${{ true }}
with:
path: ~/.CommandBox/artifacts
key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
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:
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 @@ -67,17 +107,17 @@ jobs:
box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit

- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v1
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
files: test-harness/tests/results/**/*.xml
check_name: "${{ matrix.cfengine }} Test Results"

- name: Upload Test Results Artifacts
if: always()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: test-results-${{ matrix.cfengine }}
name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}-${{ matrix.experimental }}
path: |
test-harness/tests/results/**/*

Expand All @@ -101,7 +141,7 @@ jobs:

- name: Upload Debugging Info To Artifacts
if: ${{ failure() }}
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: Failure Debugging Info - ${{ matrix.cfengine }}
path: |
Expand All @@ -114,39 +154,40 @@ jobs:
build:
name: Build & Publish
needs: tests
runs-on: ubuntu-20.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
uses: actions/cache@v1
uses: actions/cache@v4
if: ${{ true }}
with:
path: ~/.CommandBox/artifacts
key: ${{ runner.OS }}-commandbox-cache-${{ hashFiles( 'box.json' ) }}-${{ hashFiles( 'test-harness/box.json' ) }}
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
run: |
echo "VERSION=`cat box.json | jq '.version' -r`" >> $GITHUB_ENV
box package set version=@build.version@+@build.number@
# master or snapshot
# master or snapshotgit
echo "Github Ref is $GITHUB_REF"
echo "BRANCH=master" >> $GITHUB_ENV
if [ $GITHUB_REF == 'refs/heads/development' ]
Expand All @@ -156,12 +197,11 @@ 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
if: success()
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: ${{ env.MODULE_ID }}
path: |
Expand Down
97 changes: 69 additions & 28 deletions .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,41 +13,83 @@ on:
jobs:
tests:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
env:
DB_USER: root
DB_PASSWORD: root
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@2021", "adobe@2023", "adobe@2025", "boxlang-cfml@1" ]
coldboxVersion: [ "^7.0.0", "^8.0.0" ]
experimental: [ false ]
include:
- 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: Setup CommandBox
uses: elpete/setup-commandbox@v1.0.0
- 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 @@ -58,11 +100,11 @@ jobs:
box testbox run --verbose outputFile=tests/results/test-results outputFormats=json,antjunit

- name: Publish PR Test Reports
uses: mikepenz/action-junit-report@v2
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
report_paths: 'test-harness/tests/results/**/*.xml'
files: test-harness/tests/results/**/*.xml
check_name: "${{ matrix.cfengine }} Test Results"
summary: true

- name: Failure Debugging Info
if: ${{ failure() }}
Expand All @@ -72,22 +114,21 @@ jobs:

format:
name: Format
runs-on: ubuntu-20.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/**
Loading
Loading