From c350c7b60b6ee1ad3eda99d730ce6508792d7052 Mon Sep 17 00:00:00 2001 From: Oscar Tisnado Date: Thu, 6 Nov 2025 16:02:32 -0600 Subject: [PATCH 1/3] Add support for boxlang@1 in test matrix and create server configuration --- .github/workflows/tests.yml | 5 ++++- server-boxlang@1.json | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 server-boxlang@1.json diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 78bb88c..3211a4f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - cfengine: [ "lucee@5" ] + cfengine: [ "lucee@5", "boxlang@1" ] coldboxVersion: [ "^6.0.0", "^7.0.0" ] experimental: [ false ] # Here we tests all engines against ColdBox@BE @@ -26,6 +26,9 @@ jobs: - coldboxVersion: "be" cfengine: "lucee@5" experimental: true + - coldboxVersion: "be" + cfengine: "boxlang@1" + experimental: true steps: - name: Checkout Repository uses: actions/checkout@v3 diff --git a/server-boxlang@1.json b/server-boxlang@1.json new file mode 100644 index 0000000..6ea7677 --- /dev/null +++ b/server-boxlang@1.json @@ -0,0 +1,34 @@ +{ + "name":"cbstorages-boxlang@1", + "app":{ + "serverHomeDirectory":".engine/boxlang", + "cfengine":"boxlang@1" + }, + "web":{ + "http":{ + "port":"60299" + }, + "rewrites":{ + "enable": true + }, + "webroot": "test-harness", + "aliases":{ + "/moduleroot/cbSSO":"../" + } + }, + "JVM":{ + "heapSize":"768", + "javaVersion":"openjdk21_jre", + "args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888" + }, + "openBrowser":"false", + "cfconfig":{ + "file":".cfconfig.json" + }, + "env":{ + "BOXLANG_DEBUG":true + }, + "scripts":{ + "onServerInitialInstall":"install bx-esapi,bx-compat-cfml --noSave" + } +} \ No newline at end of file From 6842bfb68b24d1a7e427149659457fb8acf1caf9 Mon Sep 17 00:00:00 2001 From: Oscar Tisnado Date: Thu, 6 Nov 2025 16:13:40 -0600 Subject: [PATCH 2/3] Upgrade workflow environments to Ubuntu 22.04 across all YAML files --- .github/workflows/pr.yml | 2 +- .github/workflows/release.yml | 4 ++-- .github/workflows/snapshot.yml | 2 +- .github/workflows/tests.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d78c2d7..3157c1a 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -19,7 +19,7 @@ jobs: formatCheck: name: Checks Source Code Formatting - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout Repository uses: actions/checkout@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bab4a3d..33cbed5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: ########################################################################################## build: name: Build & Publish - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -128,7 +128,7 @@ jobs: prep_next_release: name: Prep Next Release if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 needs: [ build ] steps: # Checkout development diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index d2c7113..590979f 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -18,7 +18,7 @@ jobs: ########################################################################################## format: name: Code Auto-Formatting - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3211a4f..de11e9f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -10,7 +10,7 @@ on: jobs: tests: name: Tests - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: DB_USER: root DB_PASSWORD: root From 32ea70d22e8805bfdbe454990bea67ce633647d3 Mon Sep 17 00:00:00 2001 From: Oscar Tisnado Date: Thu, 6 Nov 2025 16:25:00 -0600 Subject: [PATCH 3/3] Upgrade actions/upload-artifact to version 4 in test workflow --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index de11e9f..52fc7f7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -108,7 +108,7 @@ jobs: - name: Upload Test Results to Artifacts if: always() - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }} path: | @@ -121,7 +121,7 @@ jobs: - name: Upload Debug Logs To Artifacts if: ${{ failure() }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }} path: |