Skip to content

Commit 9f41349

Browse files
lmajanolmajano
authored
Merge pull request #9 from coldbox-modules/development
version bump
2 parents 5982214 + 9e62c5c commit 9f41349

14 files changed

Lines changed: 210 additions & 80 deletions

‎.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: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +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
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
25-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2625

2726
- uses: Ortus-Solutions/commandbox-action@v1.0.2
2827
with:

‎.github/workflows/release.yml‎

Lines changed: 48 additions & 14 deletions
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: cbantisamy
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/setup-commandbox@v2.0.1
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,19 +65,21 @@ 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
5772
tag: v${{ env.VERSION }}
5873

5974
- name: Build ${{ env.MODULE_ID }}
6075
run: |
76+
npm install -g markdownlint-cli
77+
markdownlint changelog.md --fix
6178
box install commandbox-docbox
62-
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 }}
6380
64-
- name: Commit Changelog To Master
65-
uses: EndBug/add-and-commit@v9.1.1
81+
- name: Commit Changelog [unreleased] with latest version
82+
uses: EndBug/add-and-commit@v9.1.4
6683
if: env.SNAPSHOT == 'false'
6784
with:
6885
author_name: Github Actions
@@ -71,7 +88,7 @@ jobs:
7188
add: changelog.md
7289

7390
- name: Tag Version
74-
uses: rickstaa/action-create-tag@v1.6.1
91+
uses: rickstaa/action-create-tag@v1.7.2
7592
if: env.SNAPSHOT == 'false'
7693
with:
7794
tag: "v${{ env.VERSION }}"
@@ -80,7 +97,7 @@ jobs:
8097

8198
- name: Upload Build Artifacts
8299
if: success()
83-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
84101
with:
85102
name: ${{ env.MODULE_ID }}
86103
path: |
@@ -116,7 +133,7 @@ jobs:
116133
box forgebox publish --force
117134
118135
- name: Create Github Release
119-
uses: taiki-e/create-gh-release-action@v1.6.2
136+
uses: taiki-e/create-gh-release-action@v1.8.2
120137
continue-on-error: true
121138
if: env.SNAPSHOT == 'false'
122139
with:
@@ -125,18 +142,35 @@ jobs:
125142
token: ${{ secrets.GITHUB_TOKEN }}
126143
ref: refs/tags/v${{ env.VERSION }}
127144

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+
128157
##########################################################################################
129158
# Prep Next Release
130159
##########################################################################################
131160
prep_next_release:
132161
name: Prep Next Release
133162
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
134-
runs-on: ubuntu-20.04
163+
runs-on: ubuntu-24.04
135164
needs: [ build ]
165+
permissions:
166+
checks: write
167+
pull-requests: write
168+
contents: write
169+
issues: write
136170
steps:
137171
# Checkout development
138172
- name: Checkout Repository
139-
uses: actions/checkout@v3
173+
uses: actions/checkout@v4
140174
with:
141175
ref: development
142176

@@ -146,7 +180,7 @@ jobs:
146180
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
147181

148182
- name: Download build artifacts
149-
uses: actions/download-artifact@v2
183+
uses: actions/download-artifact@v4
150184
with:
151185
name: ${{ env.MODULE_ID }}
152186
path: .tmp
@@ -163,7 +197,7 @@ jobs:
163197
164198
# Commit it back to development
165199
- name: Commit Version Bump
166-
uses: EndBug/add-and-commit@v9.1.1
200+
uses: EndBug/add-and-commit@v9.1.4
167201
with:
168202
author_name: Github Actions
169203
author_email: info@ortussolutions.com

‎.github/workflows/snapshot.yml‎

Lines changed: 18 additions & 3 deletions
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/commandbox-action@v1.0.2
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‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -10,49 +10,51 @@ 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
40-
41-
42-
- name: Setup Java
43-
uses: actions/setup-java@v3
44-
with:
45-
distribution: "temurin"
46-
java-version: "11"
43+
uses: actions/checkout@v4
4744

45+
# DATABASE SETUP: uncomment if you need to setup a database
4846
# - name: Setup Database and Fixtures
4947
# run: |
5048
# sudo systemctl start mysql.service
51-
# # Create Database
52-
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE coolblog;'
53-
# # Import Database
49+
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE mementifier;'
5450
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/coolblog.sql
5551

52+
- name: Setup Java
53+
uses: actions/setup-java@v4
54+
with:
55+
distribution: "temurin"
56+
java-version: "21"
57+
5658
- name: Setup Environment For Testing Process
5759
run: |
5860
# Setup .env
@@ -95,7 +97,7 @@ jobs:
9597

9698
- name: Upload Test Results to Artifacts
9799
if: always()
98-
uses: actions/upload-artifact@v3
100+
uses: actions/upload-artifact@v4
99101
with:
100102
name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}
101103
path: |
@@ -108,7 +110,7 @@ jobs:
108110
109111
- name: Upload Debug Logs To Artifacts
110112
if: ${{ failure() }}
111-
uses: actions/upload-artifact@v3
113+
uses: actions/upload-artifact@v4
112114
with:
113115
name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }}
114116
path: |

‎.markdownlint.json‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +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
},
11+
"no-duplicate-header" : {
12+
"siblings_only" : true
13+
},
14+
"no-duplicate-heading" : false,
915
"no-inline-html" : false
10-
}
16+
}

0 commit comments

Comments
 (0)