Skip to content

Commit 9d2e446

Browse files
lmajanolmajano
authored
Merge pull request #55 from coldbox-modules/development
version bump
2 parents da082dd + 11c09e6 commit 9d2e446

13 files changed

+501
-472
lines changed

‎.DS_Store‎

0 Bytes
Binary file not shown.

‎.github/workflows/cron.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: Daily Tests
2+
3+
on:
4+
schedule:
5+
- cron: '0 0 * * *' # Runs at 00:00 UTC every day
6+
7+
jobs:
8+
tests:
9+
uses: ./.github/workflows/tests.yml
10+
secrets: inherit

‎.github/workflows/pr.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,19 @@ on:
66
- "main"
77
- "master"
88
- "development"
9-
- "releases/v*"
109
pull_request:
1110
branches:
12-
- "releases/v*"
1311
- development
1412

1513
jobs:
1614
tests:
1715
uses: ./.github/workflows/tests.yml
1816
secrets: inherit
1917

20-
formatCheck:
18+
# Format PR
19+
format_check:
2120
name: Checks Source Code Formatting
22-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-24.04
2322
steps:
2423
- name: Checkout Repository
2524
uses: actions/checkout@v4

‎.github/workflows/release.yml‎

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,26 @@ on:
1616
default: false
1717
type: boolean
1818

19+
# Manual Trigger
20+
workflow_dispatch:
1921
env:
20-
MODULE_ID: cbdebugger
22+
MODULE_ID: ${{ github.event.repository.name }}
23+
JDK: 21
2124
SNAPSHOT: ${{ inputs.snapshot || false }}
25+
BUILD_ID: ${{ github.run_number }}
2226

2327
jobs:
2428
##########################################################################################
2529
# Build & Publish
2630
##########################################################################################
2731
build:
2832
name: Build & Publish
29-
runs-on: ubuntu-20.04
33+
runs-on: ubuntu-24.04
34+
permissions:
35+
checks: write
36+
pull-requests: write
37+
contents: write
38+
issues: write
3039
steps:
3140
- name: Checkout Repository
3241
uses: actions/checkout@v4
@@ -41,6 +50,12 @@ jobs:
4150
with:
4251
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
4352

53+
- name: Setup Java
54+
uses: actions/setup-java@v4
55+
with:
56+
distribution: "temurin"
57+
java-version: ${{ env.JDK }}
58+
4459
- name: "Setup Environment Variables For Build Process"
4560
id: current_version
4661
run: |
@@ -55,7 +70,7 @@ jobs:
5570
fi
5671
5772
- name: Update changelog [unreleased] with latest version
58-
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
73+
uses: thomaseizinger/keep-a-changelog-new-release@3.1.0
5974
if: env.SNAPSHOT == 'false'
6075
with:
6176
changelogPath: ./changelog.md
@@ -69,10 +84,10 @@ jobs:
6984
npm install -g markdownlint-cli
7085
markdownlint changelog.md --fix
7186
box install commandbox-docbox
72-
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
87+
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ env.BUILD_ID }} :branch=${{ env.BRANCH }}
7388
74-
- name: Commit Changelog To Master
75-
uses: EndBug/[email protected].3
89+
- name: Commit Changelog [unreleased] with latest version
90+
uses: EndBug/[email protected].4
7691
if: env.SNAPSHOT == 'false'
7792
with:
7893
author_name: Github Actions
@@ -126,7 +141,7 @@ jobs:
126141
box forgebox publish --force
127142
128143
- name: Create Github Release
129-
uses: taiki-e/[email protected].0
144+
uses: taiki-e/[email protected].2
130145
continue-on-error: true
131146
if: env.SNAPSHOT == 'false'
132147
with:
@@ -135,14 +150,31 @@ jobs:
135150
token: ${{ secrets.GITHUB_TOKEN }}
136151
ref: refs/tags/v${{ env.VERSION }}
137152

153+
- name: Inform Slack
154+
if: ${{ always() }}
155+
uses: rtCamp/action-slack-notify@v2
156+
env:
157+
SLACK_CHANNEL: coding
158+
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
159+
SLACK_ICON_EMOJI: ":bell:"
160+
SLACK_MESSAGE: "Module ${{ env.MODULE_ID }} v${{ env.VERSION }} Built with ${{ job.status }}!"
161+
SLACK_TITLE: "ColdBox Module ${{ env.MODULE_ID }}"
162+
SLACK_USERNAME: CI
163+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
164+
138165
##########################################################################################
139166
# Prep Next Release
140167
##########################################################################################
141168
prep_next_release:
142169
name: Prep Next Release
143170
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
144-
runs-on: ubuntu-20.04
171+
runs-on: ubuntu-24.04
145172
needs: [ build ]
173+
permissions:
174+
checks: write
175+
pull-requests: write
176+
contents: write
177+
issues: write
146178
steps:
147179
# Checkout development
148180
- name: Checkout Repository
@@ -173,7 +205,7 @@ jobs:
173205
174206
# Commit it back to development
175207
- name: Commit Version Bump
176-
uses: EndBug/[email protected].3
208+
uses: EndBug/[email protected].4
177209
with:
178210
author_name: Github Actions
179211
author_email: [email protected]

‎.github/workflows/snapshot.yml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@ on:
55
branches:
66
- 'development'
77

8+
workflow_dispatch:
9+
10+
# Unique group name per workflow-branch/tag combo
11+
concurrency:
12+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
13+
cancel-in-progress: true
14+
815
jobs:
916
##########################################################################################
1017
# Module Tests
@@ -18,7 +25,10 @@ jobs:
1825
##########################################################################################
1926
format:
2027
name: Code Auto-Formatting
21-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-24.04
29+
permissions:
30+
contents: write
31+
checks: write
2232
steps:
2333
- uses: actions/checkout@v4
2434

@@ -39,5 +49,10 @@ jobs:
3949
uses: ./.github/workflows/release.yml
4050
needs: [ tests, format ]
4151
secrets: inherit
52+
permissions:
53+
checks: write
54+
pull-requests: write
55+
contents: write
56+
issues: write
4257
with:
4358
snapshot: true

‎.github/workflows/tests.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,43 @@ on:
1010
jobs:
1111
tests:
1212
name: Tests
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-24.04
1414
env:
1515
DB_USER: root
1616
DB_PASSWORD: root
1717
continue-on-error: ${{ matrix.experimental }}
1818
strategy:
1919
fail-fast: false
2020
matrix:
21-
cfengine: [ "lucee@5", "lucee@6", "adobe@2018", "adobe@2021", "adobe@2023" ]
22-
coldboxVersion: [ "^6.0.0", "^7.0.0" ]
21+
cfengine: [ "lucee@5", "adobe@2021", "adobe@2023" ]
22+
coldboxVersion: [ "^7.0.0" ]
2323
experimental: [ false ]
24+
# Experimental: ColdBox BE vs All Engines
2425
include:
2526
- coldboxVersion: "be"
2627
cfengine: "lucee@5"
2728
experimental: true
2829
- coldboxVersion: "be"
2930
cfengine: "lucee@6"
3031
experimental: true
31-
- coldboxVersion: "be"
32-
cfengine: "adobe@2018"
33-
experimental: true
3432
- coldboxVersion: "be"
3533
cfengine: "adobe@2021"
3634
experimental: true
3735
- coldboxVersion: "be"
3836
cfengine: "adobe@2023"
3937
experimental: true
38+
- coldboxVersion: "be"
39+
cfengine: "boxlang-cfml@1"
40+
experimental: true
4041
steps:
4142
- name: Checkout Repository
4243
uses: actions/checkout@v4
4344

44-
4545
- name: Setup Java
4646
uses: actions/setup-java@v4
4747
with:
4848
distribution: "temurin"
49-
java-version: "11"
49+
java-version: "21"
5050

5151
- name: Setup Database and Fixtures
5252
run: |

‎.markdownlint.json‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
{
2-
"MD024": { "siblings_only": true },
32
"line-length": false,
43
"single-h1": false,
4+
"no-hard-tabs" : false,
5+
"fenced-code-language" : false,
6+
"no-bare-urls" : false,
57
"first-line-h1": false,
68
"no-multiple-blanks": {
79
"maximum": 2
810
},
9-
"no-inline-html" : false,
10-
"no-hard-tabs": false,
11-
"no-bare-urls": false
11+
"no-duplicate-header" : {
12+
"siblings_only" : true
13+
},
14+
"no-duplicate-heading" : false,
15+
"no-inline-html" : false
1216
}

‎box.json‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name":"ColdBox Debugger",
33
"author":"Ortus Solutions <[email protected]",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbdebugger/@build.version@/[email protected]@.zip",
5-
"version":"4.3.0",
5+
"version":"4.4.0",
66
"slug":"cbdebugger",
77
"type":"modules",
88
"homepage":"https://github.com/coldbox-modules/cbdebugger",
@@ -26,10 +26,9 @@
2626
],
2727
"dependencies":{},
2828
"devDependencies":{
29+
"commandbox-boxlang":"*",
2930
"commandbox-cfformat":"*",
30-
"commandbox-docbox":"*",
31-
"commandbox-dotenv":"*",
32-
"commandbox-cfconfig":"*"
31+
"commandbox-docbox":"*"
3332
},
3433
"ignore":[
3534
"**/.*",
@@ -54,13 +53,10 @@
5453
"format:check":"cfformat check appenders,aspects,handlers,interceptors,models,test-harness/tests/**.cfc,ModuleConfig.cfc",
5554
"install:dependencies":"install && cd test-harness && install",
5655
"start:lucee":"server start [email protected]",
57-
"start:2018":"server start [email protected]",
5856
"start:2021":"server start [email protected]",
5957
"stop:lucee":"server stop name=cbdebugger-lucee@5",
60-
"stop:2018":"server stop name=cbdebugger-adobe@2018",
6158
"stop:2021":"server stop name=cbdebugger-adobe@2021",
6259
"logs:lucee":"server log name=cbdebugger-lucee@5 --follow",
63-
"logs:2018":"server log name=cbdebugger-adobe@2018 --follow",
6460
"logs:2021":"server log name=cbdebugger-adobe@2021 --follow"
6561
},
6662
"installPaths":{}

0 commit comments

Comments
 (0)