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
Binary file modified .DS_Store
Binary file not shown.
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
7 changes: 3 additions & 4 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,19 @@ on:
- "main"
- "master"
- "development"
- "releases/v*"
pull_request:
branches:
- "releases/v*"
- development

jobs:
tests:
uses: ./.github/workflows/tests.yml
secrets: inherit

formatCheck:
# 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
Expand Down
50 changes: 41 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,26 @@ on:
default: false
type: boolean

# Manual Trigger
workflow_dispatch:
env:
MODULE_ID: cbdebugger
MODULE_ID: ${{ github.event.repository.name }}
JDK: 21
SNAPSHOT: ${{ inputs.snapshot || false }}
BUILD_ID: ${{ github.run_number }}

jobs:
##########################################################################################
# Build & Publish
##########################################################################################
build:
name: Build & Publish
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
- name: Checkout Repository
uses: actions/checkout@v4
Expand All @@ -41,6 +50,12 @@ jobs:
with:
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}

- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: ${{ env.JDK }}

- name: "Setup Environment Variables For Build Process"
id: current_version
run: |
Expand All @@ -55,7 +70,7 @@ jobs:
fi

- name: Update changelog [unreleased] with latest version
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
uses: thomaseizinger/keep-a-changelog-new-release@3.1.0
if: env.SNAPSHOT == 'false'
with:
changelogPath: ./changelog.md
Expand All @@ -69,10 +84,10 @@ jobs:
npm install -g markdownlint-cli
markdownlint changelog.md --fix
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 }}
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ env.BUILD_ID }} :branch=${{ env.BRANCH }}

- name: Commit Changelog To Master
uses: EndBug/add-and-commit@v9.1.3
- name: Commit Changelog [unreleased] with latest version
uses: EndBug/add-and-commit@v9.1.4
if: env.SNAPSHOT == 'false'
with:
author_name: Github Actions
Expand Down Expand Up @@ -126,7 +141,7 @@ 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'
with:
Expand All @@ -135,14 +150,31 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
ref: refs/tags/v${{ env.VERSION }}

- name: Inform Slack
if: ${{ always() }}
uses: rtCamp/action-slack-notify@v2
env:
SLACK_CHANNEL: coding
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
SLACK_ICON_EMOJI: ":bell:"
SLACK_MESSAGE: "Module ${{ env.MODULE_ID }} v${{ env.VERSION }} Built with ${{ job.status }}!"
SLACK_TITLE: "ColdBox Module ${{ env.MODULE_ID }}"
SLACK_USERNAME: CI
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}

##########################################################################################
# Prep Next Release
##########################################################################################
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-24.04
needs: [ build ]
permissions:
checks: write
pull-requests: write
contents: write
issues: write
steps:
# Checkout development
- name: Checkout Repository
Expand Down Expand Up @@ -173,7 +205,7 @@ jobs:

# Commit it back to development
- name: Commit Version Bump
uses: EndBug/add-and-commit@v9.1.3
uses: EndBug/add-and-commit@v9.1.4
with:
author_name: Github Actions
author_email: info@ortussolutions.com
Expand Down
17 changes: 16 additions & 1 deletion .github/workflows/snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ on:
branches:
- 'development'

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

jobs:
##########################################################################################
# Module Tests
Expand All @@ -18,7 +25,10 @@ jobs:
##########################################################################################
format:
name: Code Auto-Formatting
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
permissions:
contents: write
checks: write
steps:
- uses: actions/checkout@v4

Expand All @@ -39,5 +49,10 @@ jobs:
uses: ./.github/workflows/release.yml
needs: [ tests, format ]
secrets: inherit
permissions:
checks: write
pull-requests: write
contents: write
issues: write
with:
snapshot: true
16 changes: 8 additions & 8 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,43 +10,43 @@ on:
jobs:
tests:
name: Tests
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
env:
DB_USER: root
DB_PASSWORD: root
continue-on-error: ${{ matrix.experimental }}
strategy:
fail-fast: false
matrix:
cfengine: [ "lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023" ]
coldboxVersion: [ "^6.0.0", "^7.0.0" ]
cfengine: [ "lucee@5", "adobe@2021", "adobe@2023" ]
coldboxVersion: [ "^7.0.0" ]
experimental: [ false ]
# Experimental: ColdBox BE vs All Engines
include:
- coldboxVersion: "be"
cfengine: "lucee@5"
experimental: true
- coldboxVersion: "be"
cfengine: "lucee@6"
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: "boxlang-cfml@1"
experimental: true
steps:
- name: Checkout Repository
uses: actions/checkout@v4


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

- name: Setup Database and Fixtures
run: |
Expand Down
12 changes: 8 additions & 4 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{
"MD024": { "siblings_only": true },
"line-length": false,
"single-h1": false,
"no-hard-tabs" : false,
"fenced-code-language" : false,
"no-bare-urls" : false,
"first-line-h1": false,
"no-multiple-blanks": {
"maximum": 2
},
"no-inline-html" : false,
"no-hard-tabs": false,
"no-bare-urls": false
"no-duplicate-header" : {
"siblings_only" : true
},
"no-duplicate-heading" : false,
"no-inline-html" : false
}
10 changes: 3 additions & 7 deletions box.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name":"ColdBox Debugger",
"author":"Ortus Solutions <info@ortussolutions.com",
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/cbdebugger-@build.version@.zip",
"version":"4.3.0",
"version":"4.4.0",
"slug":"cbdebugger",
"type":"modules",
"homepage":"https://github.com/coldbox-modules/cbdebugger",
Expand All @@ -26,10 +26,9 @@
],
"dependencies":{},
"devDependencies":{
"commandbox-boxlang":"*",
"commandbox-cfformat":"*",
"commandbox-docbox":"*",
"commandbox-dotenv":"*",
"commandbox-cfconfig":"*"
"commandbox-docbox":"*"
},
"ignore":[
"**/.*",
Expand All @@ -54,13 +53,10 @@
"format:check":"cfformat check appenders,aspects,handlers,interceptors,models,test-harness/tests/**.cfc,ModuleConfig.cfc",
"install:dependencies":"install && cd test-harness && install",
"start:lucee":"server start serverConfigFile=server-lucee@5.json",
"start:2018":"server start serverConfigFile=server-adobe@2018.json",
"start:2021":"server start serverConfigFile=server-adobe@2021.json",
"stop:lucee":"server stop name=cbdebugger-lucee@5",
"stop:2018":"server stop name=cbdebugger-adobe@2018",
"stop:2021":"server stop name=cbdebugger-adobe@2021",
"logs:lucee":"server log name=cbdebugger-lucee@5 --follow",
"logs:2018":"server log name=cbdebugger-adobe@2018 --follow",
"logs:2021":"server log name=cbdebugger-adobe@2021 --follow"
},
"installPaths":{}
Expand Down
10 changes: 7 additions & 3 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [4.3.0] - 2024-06-18

### Addded

- Lucee 6 Certification
Expand Down Expand Up @@ -47,7 +49,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Dumb whitespace added by CFML engines when doing inline `<pre>#method()#</pre>` calls.
- Better error handling when Debugger assets are not compiled instead of a cryptic error message:
`The parameter [str] to function [closure_m] is required but was not passed in.`
`The parameter [str] to function [closure_m] is required but was not passed in.`

## [4.1.0] - 2023-04-17

Expand Down Expand Up @@ -299,7 +301,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- <https://ortussolutions.atlassian.net/browse/CCM-25> Lucee support
- <https://ortussolutions.atlassian.net/browse/CCM-24> Added names of rendered
- Unloading of helpers on unload
views and layouts
views and layouts
- Updated production ignore lists

## [1.0.1]
Expand All @@ -310,7 +312,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Create first module version

[Unreleased]: https://github.com/coldbox-modules/cbdebugger/compare/v4.2.0...HEAD
[Unreleased]: https://github.com/coldbox-modules/cbdebugger/compare/v4.3.0...HEAD

[4.3.0]: https://github.com/coldbox-modules/cbdebugger/compare/v4.2.0...v4.3.0

[4.2.0]: https://github.com/coldbox-modules/cbdebugger/compare/v4.1.0...v4.2.0

Expand Down
Loading
Loading