Skip to content

Commit 7e0aef4

Browse files
lmajanolmajano
authored
Merge pull request #11 from coldbox-modules/development
version bump
2 parents 4562cec + 9e5a7a8 commit 7e0aef4

15 files changed

+169
-88
lines changed

‎.github/workflows/cron.yml

+10
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

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,22 @@ 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
16+
secrets: inherit
1817

19-
formatCheck:
18+
# Format PR
19+
format_check:
2020
name: Checks Source Code Formatting
21-
runs-on: ubuntu-20.04
21+
runs-on: ubuntu-24.04
2222
steps:
2323
- name: Checkout Repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- uses: Ortus-Solutions/[email protected]
2727
with:

‎.github/workflows/release.yml

+46-14
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,41 @@ on:
1616
default: false
1717
type: boolean
1818

19+
# Manual Trigger
20+
workflow_dispatch:
1921
env:
20-
MODULE_ID: cbmarkdown
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
32-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
3342

3443
- name: Setup CommandBox
3544
uses: Ortus-Solutions/[email protected]
3645
with:
3746
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
3847

48+
- name: Setup Java
49+
uses: actions/setup-java@v4
50+
with:
51+
distribution: "temurin"
52+
java-version: ${{ env.JDK }}
53+
3954
- name: "Setup Environment Variables For Build Process"
4055
id: current_version
4156
run: |
@@ -50,7 +65,7 @@ jobs:
5065
fi
5166
5267
- name: Update changelog [unreleased] with latest version
53-
uses: thomaseizinger/keep-a-changelog-new-release@1.3.0
68+
uses: thomaseizinger/keep-a-changelog-new-release@3.1.0
5469
if: env.SNAPSHOT == 'false'
5570
with:
5671
changelogPath: ./changelog.md
@@ -61,10 +76,10 @@ jobs:
6176
npm install -g markdownlint-cli
6277
markdownlint changelog.md --fix
6378
box install commandbox-docbox
64-
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
79+
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ env.BUILD_ID }} :branch=${{ env.BRANCH }}
6580
66-
- name: Commit Changelog To Master
67-
uses: EndBug/[email protected].1
81+
- name: Commit Changelog [unreleased] with latest version
82+
uses: EndBug/[email protected].4
6883
if: env.SNAPSHOT == 'false'
6984
with:
7085
author_name: Github Actions
@@ -73,7 +88,7 @@ jobs:
7388
add: changelog.md
7489

7590
- name: Tag Version
76-
uses: rickstaa/action-create-tag@v1.6.1
91+
uses: rickstaa/action-create-tag@v1.7.2
7792
if: env.SNAPSHOT == 'false'
7893
with:
7994
tag: "v${{ env.VERSION }}"
@@ -82,7 +97,7 @@ jobs:
8297

8398
- name: Upload Build Artifacts
8499
if: success()
85-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
86101
with:
87102
name: ${{ env.MODULE_ID }}
88103
path: |
@@ -118,7 +133,7 @@ jobs:
118133
box forgebox publish --force
119134
120135
- name: Create Github Release
121-
uses: taiki-e/create-gh-release-action@v1.6.2
136+
uses: taiki-e/create-gh-release-action@v1.8.2
122137
continue-on-error: true
123138
if: env.SNAPSHOT == 'false'
124139
with:
@@ -127,18 +142,35 @@ jobs:
127142
token: ${{ secrets.GITHUB_TOKEN }}
128143
ref: refs/tags/v${{ env.VERSION }}
129144

145+
- name: Inform Slack
146+
if: ${{ always() }}
147+
uses: rtCamp/action-slack-notify@v2
148+
env:
149+
SLACK_CHANNEL: coding
150+
SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
151+
SLACK_ICON_EMOJI: ":bell:"
152+
SLACK_MESSAGE: "Module ${{ env.MODULE_ID }} v${{ env.VERSION }} Built with ${{ job.status }}!"
153+
SLACK_TITLE: "ColdBox Module ${{ env.MODULE_ID }}"
154+
SLACK_USERNAME: CI
155+
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
156+
130157
##########################################################################################
131158
# Prep Next Release
132159
##########################################################################################
133160
prep_next_release:
134161
name: Prep Next Release
135162
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
136-
runs-on: ubuntu-20.04
163+
runs-on: ubuntu-24.04
137164
needs: [ build ]
165+
permissions:
166+
checks: write
167+
pull-requests: write
168+
contents: write
169+
issues: write
138170
steps:
139171
# Checkout development
140172
- name: Checkout Repository
141-
uses: actions/checkout@v3
173+
uses: actions/checkout@v4
142174
with:
143175
ref: development
144176

@@ -148,7 +180,7 @@ jobs:
148180
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
149181

150182
- name: Download build artifacts
151-
uses: actions/download-artifact@v2
183+
uses: actions/download-artifact@v4
152184
with:
153185
name: ${{ env.MODULE_ID }}
154186
path: .tmp
@@ -165,7 +197,7 @@ jobs:
165197
166198
# Commit it back to development
167199
- name: Commit Version Bump
168-
uses: EndBug/[email protected].1
200+
uses: EndBug/[email protected].4
169201
with:
170202
author_name: Github Actions
171203
author_email: [email protected]

‎.github/workflows/snapshot.yml

+18-3
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,17 +25,20 @@ 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:
23-
- uses: actions/checkout@v3
33+
- uses: actions/checkout@v4
2434

2535
- name: Auto-format
2636
uses: Ortus-Solutions/[email protected]
2737
with:
2838
cmd: run-script format
2939

3040
- name: Commit Format Changes
31-
uses: stefanzweifel/git-auto-commit-action@v4
41+
uses: stefanzweifel/git-auto-commit-action@v5
3242
with:
3343
commit_message: Apply cfformat changes
3444

@@ -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

+22-18
Original file line numberDiff line numberDiff line change
@@ -10,64 +10,68 @@ 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", "adobe@2018", "adobe@2021" ]
22-
coldboxVersion: [ "^6.0.0" ]
21+
cfengine: [ "boxlang-cfml@1", "lucee@5", "adobe@2021", "adobe@2023" ]
22+
coldboxVersion: [ "^7.0.0" ]
2323
experimental: [ false ]
24+
# Experimental: ColdBox BE vs All Engines
2425
include:
25-
- cfengine: "adobe@2023"
26-
coldboxVersion: "^6.0.0"
27-
experimental: true
2826
- coldboxVersion: "be"
2927
cfengine: "lucee@5"
3028
experimental: true
3129
- coldboxVersion: "be"
32-
cfengine: "adobe@2018"
30+
cfengine: "lucee@6"
3331
experimental: true
3432
- coldboxVersion: "be"
3533
cfengine: "adobe@2021"
3634
experimental: true
35+
- coldboxVersion: "be"
36+
cfengine: "adobe@2023"
37+
experimental: true
38+
- coldboxVersion: "be"
39+
cfengine: "boxlang-cfml@1"
40+
experimental: true
3741
steps:
3842
- name: Checkout Repository
39-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4044

45+
# DATABASE SETUP: uncomment if you need to setup a database
4146
# - name: Setup Database and Fixtures
4247
# run: |
4348
# sudo systemctl start mysql.service
4449
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE mementifier;'
4550
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/coolblog.sql
4651

4752
- name: Setup Java
48-
uses: actions/setup-java@v3
53+
uses: actions/setup-java@v4
4954
with:
5055
distribution: "temurin"
51-
java-version: "11"
52-
53-
- name: Setup CommandBox CLI
54-
uses: Ortus-Solutions/[email protected]
56+
java-version: "21"
5557

5658
- name: Setup Environment For Testing Process
5759
run: |
5860
# Setup .env
5961
touch .env
6062
# ENV
63+
printf "ENVIRONMENT=development\n" >> .env
6164
printf "DB_HOST=localhost\n" >> .env
62-
printf "DB_DATABASE=mydatabase\n" >> .env
63-
printf "DB_DRIVER=MySQL\n" >> .env
6465
printf "DB_USER=${{ env.DB_USER }}\n" >> .env
6566
printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env
6667
printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
6768
printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
6869
printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env
6970
70-
- name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
71+
- name: Setup CommandBox CLI
72+
uses: Ortus-Solutions/[email protected]
73+
74+
- name: Install Dependencies
7175
run: |
7276
box install
7377
cd test-harness
@@ -93,7 +97,7 @@ jobs:
9397

9498
- name: Upload Test Results to Artifacts
9599
if: always()
96-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
97101
with:
98102
name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}
99103
path: |
@@ -106,7 +110,7 @@ jobs:
106110
107111
- name: Upload Debug Logs To Artifacts
108112
if: ${{ failure() }}
109-
uses: actions/upload-artifact@v3
113+
uses: actions/upload-artifact@v4
110114
with:
111115
name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }}
112116
path: |

‎.markdownlint.json

+1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
"no-duplicate-header" : {
1212
"siblings_only" : true
1313
},
14+
"no-duplicate-heading" : false,
1415
"no-inline-html" : false
1516
}

‎box.json

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"ColdBox Markdown",
3-
"version":"3.6.0",
3+
"version":"3.7.0",
44
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbmarkdown/@build.version@/[email protected]@.zip",
55
"author":"Ortus Solutions.com <[email protected]>",
66
"slug":"cbmarkdown",
@@ -24,10 +24,9 @@
2424
"cbemoji":"^1.0.1"
2525
},
2626
"devDependencies":{
27+
"commandbox-boxlang":"*",
2728
"commandbox-cfformat":"*",
28-
"commandbox-docbox":"*",
29-
"commandbox-dotenv":"*",
30-
"commandbox-cfconfig":"*"
29+
"commandbox-docbox":"*"
3130
},
3231
"ignore":[
3332
"**/.*",
@@ -46,13 +45,10 @@
4645
"format:watch":"cfformat watch helpers,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
4746
"format:check":"cfformat check helpers,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
4847
"start:lucee":"server start [email protected]",
49-
"start:2018":"server start [email protected]",
5048
"start:2021":"server start [email protected]",
5149
"stop:lucee":"server stop [email protected]",
52-
"stop:2018":"server stop [email protected]",
5350
"stop:2021":"server stop [email protected]",
5451
"logs:lucee":"server log [email protected] --follow",
55-
"logs:2018":"server log [email protected] --follow",
5652
"logs:2021":"server log [email protected] --follow"
5753
},
5854
"installPaths":{

0 commit comments

Comments
 (0)