Skip to content

Commit 724d630

Browse files
committed
boxlang prime and more
1 parent 6134d40 commit 724d630

File tree

11 files changed

+157
-70
lines changed

11 files changed

+157
-70
lines changed

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
version: 2
2+
updates:
3+
# GitHub Actions - updates uses: statements in workflows
4+
- package-ecosystem: "github-actions"
5+
directory: "/" # Where your .github/workflows/ folder is
6+
schedule:
7+
interval: "monthly"

.github/workflows/pr.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ on:
66
- "main"
77
- "master"
88
- "development"
9+
- "releases/v*"
910
pull_request:
1011
branches:
12+
- "releases/v*"
1113
- development
1214

1315
jobs:
@@ -18,11 +20,11 @@ jobs:
1820
# Format PR
1921
format_check:
2022
name: Checks Source Code Formatting
21-
runs-on: ubuntu-24.04
23+
runs-on: ubuntu-latest
2224
steps:
2325
- name: Checkout Repository
24-
uses: actions/checkout@v4
26+
uses: actions/checkout@v5
2527

26-
- uses: Ortus-Solutions/[email protected].2
28+
- uses: Ortus-Solutions/[email protected].3
2729
with:
2830
cmd: run-script format:check

.github/workflows/release.yml

Lines changed: 41 additions & 9 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:
2022
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-24.04
33+
runs-on: ubuntu-latest
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@v4
41+
uses: actions/checkout@v5
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@v5
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,9 +76,9 @@ 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
81+
- name: Commit Changelog [unreleased] with latest version
6782
uses: EndBug/[email protected]
6883
if: env.SNAPSHOT == 'false'
6984
with:
@@ -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.8.2
136+
uses: taiki-e/create-gh-release-action@v1.9.1
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-24.04
163+
runs-on: ubuntu-latest
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@v4
173+
uses: actions/checkout@v5
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@v4
183+
uses: actions/download-artifact@v5
152184
with:
153185
name: ${{ env.MODULE_ID }}
154186
path: .tmp

.github/workflows/snapshot.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99

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

1515
jobs:
@@ -25,17 +25,20 @@ jobs:
2525
##########################################################################################
2626
format:
2727
name: Code Auto-Formatting
28-
runs-on: ubuntu-24.04
28+
runs-on: ubuntu-latest
29+
permissions:
30+
contents: write
31+
checks: write
2932
steps:
30-
- uses: actions/checkout@v4
33+
- uses: actions/checkout@v5
3134

3235
- name: Auto-format
33-
uses: Ortus-Solutions/[email protected].2
36+
uses: Ortus-Solutions/[email protected].3
3437
with:
3538
cmd: run-script format
3639

3740
- name: Commit Format Changes
38-
uses: stefanzweifel/git-auto-commit-action@v5
41+
uses: stefanzweifel/git-auto-commit-action@v6
3942
with:
4043
commit_message: Apply cfformat changes
4144

@@ -46,5 +49,10 @@ jobs:
4649
uses: ./.github/workflows/release.yml
4750
needs: [ tests, format ]
4851
secrets: inherit
52+
permissions:
53+
checks: write
54+
pull-requests: write
55+
contents: write
56+
issues: write
4957
with:
5058
snapshot: true

.github/workflows/tests.yml

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@ on:
1010
jobs:
1111
tests:
1212
name: Tests
13-
runs-on: ubuntu-24.04
13+
runs-on: ubuntu-latest
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: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
21+
cfengine: [ "boxlang@1", "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2023", "adobe@2025" ]
2222
coldboxVersion: [ "^7.0.0" ]
2323
experimental: [ false ]
24+
# Experimental: ColdBox BE vs All Engines
2425
include:
2526
- coldboxVersion: "be"
2627
cfengine: "lucee@5"
@@ -29,28 +30,48 @@ jobs:
2930
cfengine: "lucee@6"
3031
experimental: true
3132
- coldboxVersion: "be"
32-
cfengine: "adobe@2021"
33+
cfengine: "adobe@2025"
3334
experimental: true
3435
- coldboxVersion: "be"
35-
cfengine: "adobe@2023"
36+
cfengine: "boxlang-cfml@1"
3637
experimental: true
3738
- coldboxVersion: "be"
38-
cfengine: "boxlang-cfml@1"
39+
cfengine: "boxlang@1"
3940
experimental: true
4041
steps:
4142
- name: Checkout Repository
42-
uses: actions/checkout@v4
43+
uses: actions/checkout@v5
44+
45+
# DATABASE SETUP: uncomment if you need to setup a database
46+
# - name: Setup Database and Fixtures
47+
# run: |
48+
# sudo systemctl start mysql.service
49+
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE mementifier;'
50+
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/coolblog.sql
4351

4452
- name: Setup Java
45-
uses: actions/setup-java@v4
53+
uses: actions/setup-java@v5
4654
with:
4755
distribution: "temurin"
4856
java-version: "21"
4957

58+
- name: Setup Environment For Testing Process
59+
run: |
60+
# Setup .env
61+
touch .env
62+
# ENV
63+
printf "ENVIRONMENT=development\n" >> .env
64+
printf "DB_HOST=localhost\n" >> .env
65+
printf "DB_USER=${{ env.DB_USER }}\n" >> .env
66+
printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env
67+
printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
68+
printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
69+
printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env
70+
5071
- name: Setup CommandBox CLI
5172
uses: Ortus-Solutions/[email protected]
5273

53-
- name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
74+
- name: Install Dependencies
5475
run: |
5576
box install
5677
cd test-harness
@@ -67,12 +88,16 @@ jobs:
6788
mkdir -p test-harness/tests/results
6889
box testbox run --verbose outputFile=test-harness/tests/results/test-results outputFormats=json,antjunit
6990
70-
- name: Publish Test Results
71-
uses: EnricoMi/publish-unit-test-result-action@v2
91+
- name: Publish Test Reports
92+
uses: mikepenz/[email protected]
7293
if: always()
7394
with:
74-
junit_files: test-harness/tests/results/**/*.xml
75-
check_name: "${{ matrix.cfengine }} ColdBox ${{ matrix.coldboxVersion }} Test Results"
95+
report_paths: |
96+
test-harness/tests/results/**/*.xml
97+
check_name: "TestBox Report ${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}"
98+
include_passed: false
99+
fail_on_failure: true
100+
detailed_summary: true
76101

77102
- name: Upload Test Results to Artifacts
78103
if: always()

box.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@
2828
"devDependencies":{
2929
"commandbox-boxlang":"*",
3030
"commandbox-cfformat":"*",
31-
"commandbox-docbox":"*",
32-
"commandbox-dotenv":"*",
33-
"commandbox-cfconfig":"*"
31+
"commandbox-docbox":"*"
3432
},
3533
"ignore":[
3634
"**/.*",
@@ -43,20 +41,19 @@
4341
"scripts":{
4442
"build:module":"task run taskFile=build/Build.cfc :projectName=`package show slug` :version=`package show version`",
4543
"build:docs":"task run taskFile=build/Build.cfc target=docs :projectName=`package show slug` :version=`package show version`",
46-
"release":"recipe build/release.boxr",
4744
"format":"cfformat run helpers,interfaces,models,test-harness/tests/,ModuleConfig.cfc --overwrite",
4845
"format:watch":"cfformat watch helpers,interfaces,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
4946
"format:check":"cfformat check helpers,interfaces,models,test-harness/tests/,ModuleConfig.cfc ./.cfformat.json",
5047
"install:dependencies":"install && cd test-harness && install",
5148
"start:lucee":"server start [email protected]",
52-
"start:2018":"server start serverConfigFile=server-adobe@2018.json",
53-
"start:2021":"server start serverConfigFile=server-adobe@2021.json",
49+
"start:adobe":"server start serverConfigFile=server-adobe@2025.json",
50+
"start:boxlang":"server start serverConfigFile=server-boxlang@1.json",
5451
"stop:lucee":"server stop [email protected]",
55-
"stop:2018":"server stop serverConfigFile=server-adobe@2018.json",
56-
"stop:2021":"server stop serverConfigFile=server-adobe@2021.json",
52+
"stop:adobe":"server stop serverConfigFile=server-adobe@2025.json",
53+
"stop:boxlang":"server stop serverConfigFile=server-boxlang@1.json",
5754
"logs:lucee":"server log [email protected] --follow",
58-
"logs:2018":"server log serverConfigFile=server-adobe@2018.json --follow",
59-
"logs:2021":"server log serverConfigFile=server-adobe@2021.json --follow"
55+
"logs:adobe":"server log serverConfigFile=server-adobe@2025.json --follow",
56+
"logs:boxlang":"server log serverConfigFile=server-boxlang@1.json --follow"
6057
},
6158
"installPaths":{
6259
"cbi18n":"modules/cbi18n/"

changelog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
## [Unreleased]
1111

12+
### Added
13+
14+
- GitHub Actions update
15+
- BoxLang PRIME
16+
- Adobe 2025
17+
1218
## [4.5.0] - 2025-02-19
1319

1420
### Removed

[email protected]

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"name":"cbvalidation-adobe@2021",
2+
"name":"cbvalidation-adobe@2025",
33
"app":{
4-
"serverHomeDirectory":".engine/adobe2021",
5-
"cfengine":"adobe@2021"
4+
"serverHomeDirectory":".engine/adobe2025",
5+
"cfengine":"adobe@2025"
66
},
77
"web":{
88
"http":{

0 commit comments

Comments
 (0)