Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 10 additions & 0 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: Daily Tests

on:
schedule:
- cron: '0 0 * * *' # Runs at 00:00 UTC every day

jobs:
tests:
uses: ./.github/workflows/tests.yml
secrets: inherit
6 changes: 2 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ on:
- "main"
- "master"
- "development"
- "releases/v*"
pull_request:
branches:
- "releases/v*"
- development

jobs:
Expand All @@ -20,11 +18,11 @@ jobs:
# Format PR
format_check:
name: Checks Source Code Formatting
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Checkout Repository
uses: actions/checkout@v4

- uses: Ortus-Solutions/commandbox-action@v1.0.3
- uses: Ortus-Solutions/commandbox-action@v1.0.2
with:
cmd: run-script format:check
10 changes: 4 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Release
name: Build a Release

on:
# If you push to master|main this will trigger a stable release
Expand All @@ -18,7 +18,6 @@ on:

# Manual Trigger
workflow_dispatch:

env:
MODULE_ID: ${{ github.event.repository.name }}
JDK: 21
Expand All @@ -31,7 +30,7 @@ jobs:
##########################################################################################
build:
name: Build & Publish
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
checks: write
pull-requests: write
Expand Down Expand Up @@ -134,10 +133,9 @@ jobs:
box forgebox publish --force

- name: Create Github Release
uses: taiki-e/create-gh-release-action@v1.8.0
uses: taiki-e/create-gh-release-action@v1.8.2
continue-on-error: true
if: env.SNAPSHOT == 'false'
id: create_release
with:
title: ${{ env.VERSION }}
changelog: changelog.md
Expand All @@ -162,7 +160,7 @@ jobs:
prep_next_release:
name: Prep Next Release
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
needs: [ build ]
permissions:
checks: write
Expand Down
23 changes: 8 additions & 15 deletions .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,35 @@ on:
branches:
- 'development'

# Cancel running builds if another push to branch is made while this build is running
workflow_dispatch:

# Unique group name per workflow-branch/tag combo
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
MODULE_ID: ${{ github.event.repository.name }}
JDK_VERSION: 21

jobs:
#############################################
# Tests First baby! We fail, no build :(
#############################################
##########################################################################################
# Module Tests
##########################################################################################
tests:
secrets: inherit
uses: ./.github/workflows/tests.yml
permissions:
checks: write
pull-requests: write
contents: read
issues: read

##########################################################################################
# Format Source Code
##########################################################################################
format:
name: Code Auto-Formatting
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
permissions:
contents: write
checks: write
steps:
- uses: actions/checkout@v4

- name: Auto-format
uses: Ortus-Solutions/commandbox-action@v1.0.3
uses: Ortus-Solutions/commandbox-action@v1.0.2
with:
cmd: run-script format

Expand Down
66 changes: 27 additions & 39 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,46 +7,36 @@ on:
SLACK_WEBHOOK_URL:
required: false

env:
MODULE_ID: ${{ github.event.repository.name }}

jobs:
tests:
name: Tests
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
env:
DB_USER: root
DB_PASSWORD: root
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
cfengine: [ "boxlang@1", "lucee@5", "lucee@6", "adobe@2023" ]
coldboxVersion: [ "^6.0.0", "^7.0.0" ]
jdkVersion: [ "21" ]
cfengine: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
coldboxVersion: [ "^7.0.0" ]
experimental: [ false ]
# Experimental: ColdBox BE vs All Engines
include:
# Adobe 2021 JDK11
- cfengine: "adobe@2021"
coldboxVersion: "^7.0.0"
jdkVersion: 11
experimental: false
# Bleeding Edge Tests
- coldboxVersion: "be"
cfengine: "boxlang@1"
jdkVersion: 21
experimental: true
- coldboxVersion: "be"
cfengine: "lucee@5"
jdkVersion: 21
experimental: true
- coldboxVersion: "be"
cfengine: "lucee@6"
jdkVersion: 21
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2021"
experimental: true
- coldboxVersion: "be"
cfengine: "adobe@2023"
jdkVersion: 21
experimental: true
- coldboxVersion: "be"
cfengine: "boxlang-cfml@1"
experimental: true
steps:
- name: Checkout Repository
Expand All @@ -63,32 +53,30 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: ${{ matrix.jdkVersion }}
java-version: "21"

- name: Setup Environment For Testing Process
run: |
# Setup .env
touch .env
# ENV
printf "ENVIRONMENT=development\n" >> .env
printf "DB_HOST=localhost\n" >> .env
printf "DB_USER=${{ env.DB_USER }}\n" >> .env
printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env
printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env

- name: Setup CommandBox CLI
uses: Ortus-Solutions/setup-commandbox@v2.0.1

# Not Needed in this module
#- name: Setup Environment For Testing Process
# run: |
# # Setup .env
# touch .env
# # ENV
# printf "DB_HOST=localhost\n" >> .env
# printf "DB_DATABASE=mydatabase\n" >> .env
# printf "DB_DRIVER=MySQL\n" >> .env
# printf "DB_USER=${{ env.DB_USER }}\n" >> .env
# printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env
# printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
# printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
# printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env

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

- name: Start ${{ matrix.cfengine }} Server
run: |
Expand Down
26 changes: 12 additions & 14 deletions box.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name":"cbMockData",
"version":"4.0.0",
"version":"4.1.0",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbMockData/@build.version@/cbMockData-@build.version@.zip",
"author":"Ortus Solutions",
"homepage":"https://github.com/coldbox-modules/cbMockData",
Expand Down Expand Up @@ -29,10 +29,8 @@
"dependencies":{},
"devDependencies":{
"commandbox-boxlang":"*",
"commandbox-cfformat":"*",
"commandbox-docbox":"*",
"commandbox-dotenv":"*",
"commandbox-cfconfig":"*"
"commandbox-cfformat":"*",
"commandbox-docbox":"*"
},
"installPaths":{},
"ignore":[
Expand All @@ -51,14 +49,14 @@
"format":"cfformat run helpers,models,test-harness/tests/,ModuleConfig.cfc --overwrite",
"format:watch":"cfformat watch helpers,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
"format:check":"cfformat check helpers,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
"start:boxlang" : "server start serverConfigFile=server-boxlang@1.json",
"start:lucee" : "server start serverConfigFile=server-lucee@5.json",
"start:2023" : "server start serverConfigFile=server-adobe@2023.json",
"stop:boxlang" : "server stop serverConfigFile=server-boxlang@1.json",
"stop:lucee" : "server stop serverConfigFile=server-lucee@5.json",
"stop:2023" : "server stop serverConfigFile=server-adobe@2023.json",
"logs:boxlang" : "server log serverConfigFile=server-boxlang@1.json --follow",
"logs:lucee" : "server log serverConfigFile=server-lucee@5.json --follow",
"logs:2023" : "server log serverConfigFile=server-adobe@2023.json --follow"
"start:boxlang":"server start serverConfigFile=server-boxlang@1.json",
"start:lucee":"server start serverConfigFile=server-lucee@5.json",
"start:2023":"server start serverConfigFile=server-adobe@2023.json",
"stop:boxlang":"server stop serverConfigFile=server-boxlang@1.json",
"stop:lucee":"server stop serverConfigFile=server-lucee@5.json",
"stop:2023":"server stop serverConfigFile=server-adobe@2023.json",
"logs:boxlang":"server log serverConfigFile=server-boxlang@1.json --follow",
"logs:lucee":"server log serverConfigFile=server-lucee@5.json --follow",
"logs:2023":"server log serverConfigFile=server-adobe@2023.json --follow"
}
}
16 changes: 15 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,22 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

----
* * *

## [Unreleased]

### Added

- BoxLang certification
- Updated github actions
- BoxLang as the default server for the RESTFul service

## [4.0.0] - 2025-01-28

## [3.7.0] - 2024-05-09

### Added

- BoxLang support
- Drop Adobe old engines

Expand Down Expand Up @@ -178,3 +188,7 @@ This will produce top level mock data with 2 books per record.
## [1.0.0]

- Original by Ray Camden

[unreleased]: https://github.com/coldbox-modules/cbMockData/compare/v4.0.0...HEAD
[4.0.0]: https://github.com/coldbox-modules/cbMockData/compare/v3.7.0...v4.0.0
[3.7.0]: https://github.com/coldbox-modules/MockDataCFC/compare/c78c01b939bde5a9396bff90a4bf8d34073ddf98...v3.7.0
2 changes: 1 addition & 1 deletion server-boxlang@1.json → server-boxlang-cfml@1.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"JVM":{
"heapSize":"512",
"javaVersion":"openjdk21_jre",
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999"
"args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999 -Dboxlang.debugMode=true"
},
"cfconfig":{
"file":".cfconfig.json"
Expand Down
16 changes: 15 additions & 1 deletion server.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
{
"name":"cbMockDataService",
"app":{
"cfengine":"boxlang@1"
},
"web":{
"http":{
"port":3000
},
"rewrites":{
"enable":true
}
},
"JVM":{
"heapSize":"512",
"javaVersion":"openjdk21_jre"
},
"env":{
"BOXLANG_DEBUG": false
},
"scripts":{
"onServerInitialInstall":"install bx-compat-cfml --noSave"
}
}
}
Loading