Skip to content

Commit 83f54df

Browse files
lmajanolmajano
authored
Merge pull request #84 from coldbox-modules/development
version bump
2 parents bb46a0a + aba6b1b commit 83f54df

21 files changed

+235
-92
lines changed

‎.github/CODE_OF_CONDUCT.MD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Code of Conduct
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#code-of-conduct).

‎.github/SECURITY.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Security Policy
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#security-vulnerabilities).

‎.github/SUPPORT.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Support & Help
2+
3+
Please see it in our [Contributing Guidelines](../CONTRIBUTING.md#support-questions).

‎.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/[email protected]
2827
with:

‎.github/workflows/release.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
type: boolean
1818

1919
env:
20-
MODULE_ID: cbvalidation
20+
MODULE_ID: ${{ github.event.repository.name }}
2121
SNAPSHOT: ${{ inputs.snapshot || false }}
2222

2323
jobs:
@@ -26,10 +26,10 @@ jobs:
2626
##########################################################################################
2727
build:
2828
name: Build & Publish
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-24.04
3030
steps:
3131
- name: Checkout Repository
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333

3434
- name: Setup CommandBox
3535
uses: Ortus-Solutions/[email protected]
@@ -64,7 +64,7 @@ jobs:
6464
box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
6565
6666
- name: Commit Changelog To Master
67-
uses: EndBug/[email protected].1
67+
uses: EndBug/[email protected].4
6868
if: env.SNAPSHOT == 'false'
6969
with:
7070
author_name: Github Actions
@@ -73,7 +73,7 @@ jobs:
7373
add: changelog.md
7474

7575
- name: Tag Version
76-
uses: rickstaa/action-create-tag@v1.6.1
76+
uses: rickstaa/action-create-tag@v1.7.2
7777
if: env.SNAPSHOT == 'false'
7878
with:
7979
tag: "v${{ env.VERSION }}"
@@ -82,7 +82,7 @@ jobs:
8282

8383
- name: Upload Build Artifacts
8484
if: success()
85-
uses: actions/upload-artifact@v3
85+
uses: actions/upload-artifact@v4
8686
with:
8787
name: ${{ env.MODULE_ID }}
8888
path: |
@@ -118,7 +118,7 @@ jobs:
118118
box forgebox publish --force
119119
120120
- name: Create Github Release
121-
uses: taiki-e/create-gh-release-action@v1.6.2
121+
uses: taiki-e/create-gh-release-action@v1.8.2
122122
continue-on-error: true
123123
if: env.SNAPSHOT == 'false'
124124
with:
@@ -133,12 +133,12 @@ jobs:
133133
prep_next_release:
134134
name: Prep Next Release
135135
if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
136-
runs-on: ubuntu-20.04
136+
runs-on: ubuntu-24.04
137137
needs: [ build ]
138138
steps:
139139
# Checkout development
140140
- name: Checkout Repository
141-
uses: actions/checkout@v3
141+
uses: actions/checkout@v4
142142
with:
143143
ref: development
144144

@@ -148,7 +148,7 @@ jobs:
148148
forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
149149

150150
- name: Download build artifacts
151-
uses: actions/download-artifact@v2
151+
uses: actions/download-artifact@v4
152152
with:
153153
name: ${{ env.MODULE_ID }}
154154
path: .tmp
@@ -165,7 +165,7 @@ jobs:
165165
166166
# Commit it back to development
167167
- name: Commit Version Bump
168-
uses: EndBug/[email protected].1
168+
uses: EndBug/[email protected].4
169169
with:
170170
author_name: Github Actions
171171
author_email: [email protected]

‎.github/workflows/snapshot.yml‎

Lines changed: 10 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.ref }}
13+
cancel-in-progress: true
14+
815
jobs:
916
##########################################################################################
1017
# Module Tests
@@ -18,17 +25,17 @@ jobs:
1825
##########################################################################################
1926
format:
2027
name: Code Auto-Formatting
21-
runs-on: ubuntu-20.04
28+
runs-on: ubuntu-24.04
2229
steps:
23-
- uses: actions/checkout@v3
30+
- uses: actions/checkout@v4
2431

2532
- name: Auto-format
2633
uses: Ortus-Solutions/[email protected]
2734
with:
2835
cmd: run-script format
2936

3037
- name: Commit Format Changes
31-
uses: stefanzweifel/git-auto-commit-action@v4
38+
uses: stefanzweifel/git-auto-commit-action@v5
3239
with:
3340
commit_message: Apply cfformat changes
3441

‎.github/workflows/tests.yml‎

Lines changed: 15 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -10,66 +10,46 @@ 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", "lucee@6", "adobe@2021", "adobe@2023" ]
22+
coldboxVersion: [ "^7.0.0" ]
2323
experimental: [ false ]
2424
include:
25-
- cfengine: "adobe@2023"
26-
coldboxVersion: "^6.0.0"
27-
experimental: true
2825
- coldboxVersion: "be"
2926
cfengine: "lucee@5"
3027
experimental: true
3128
- coldboxVersion: "be"
32-
cfengine: "adobe@2018"
29+
cfengine: "lucee@6"
3330
experimental: true
3431
- coldboxVersion: "be"
3532
cfengine: "adobe@2021"
3633
experimental: true
34+
- coldboxVersion: "be"
35+
cfengine: "adobe@2023"
36+
experimental: true
37+
- coldboxVersion: "be"
38+
cfengine: "boxlang-cfml@1"
39+
experimental: true
3740
steps:
3841
- name: Checkout Repository
39-
uses: actions/checkout@v3
40-
41-
# Not Needed in this module
42-
#- name: Setup Database and Fixtures
43-
# run: |
44-
# sudo /etc/init.d/mysql start
45-
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE coolblog;'
46-
# mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/coolblog.sql
42+
uses: actions/checkout@v4
4743

4844
- name: Setup Java
49-
uses: actions/setup-java@v3
45+
uses: actions/setup-java@v4
5046
with:
5147
distribution: "temurin"
52-
java-version: "11"
48+
java-version: "21"
5349

5450
- name: Setup CommandBox CLI
5551
uses: Ortus-Solutions/[email protected]
5652

57-
# Not Needed in this module
58-
#- name: Setup Environment For Testing Process
59-
# working-directory: ./test-harness
60-
# run: |
61-
# # Setup .env
62-
# touch .env
63-
# # ENV
64-
# printf "DB_HOST=localhost\n" >> .env
65-
# printf "DB_DATABASE=mydatabase\n" >> .env
66-
# printf "DB_DRIVER=MySQL\n" >> .env
67-
# printf "DB_USER=${{ env.DB_USER }}\n" >> .env
68-
# printf "DB_PASSWORD=${{ env.DB_PASSWORD }}\n" >> .env
69-
# printf "DB_CLASS=com.mysql.cj.jdbc.Driver\n" >> .env
70-
# printf "DB_BUNDLEVERSION=8.0.19\n" >> .env
71-
# printf "DB_BUNDLENAME=com.mysql.cj\n" >> .env
72-
7353
- name: Install Test Harness with ColdBox ${{ matrix.coldboxVersion }}
7454
run: |
7555
box install
@@ -96,7 +76,7 @@ jobs:
9676

9777
- name: Upload Test Results to Artifacts
9878
if: always()
99-
uses: actions/upload-artifact@v3
79+
uses: actions/upload-artifact@v4
10080
with:
10181
name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}
10282
path: |
@@ -109,7 +89,7 @@ jobs:
10989
11090
- name: Upload Debug Logs To Artifacts
11191
if: ${{ failure() }}
112-
uses: actions/upload-artifact@v3
92+
uses: actions/upload-artifact@v4
11393
with:
11494
name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }}
11595
path: |

‎.markdownlint.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@
1010
},
1111
"no-duplicate-header" : {
1212
"siblings_only" : true
13-
}
14-
}
13+
},
14+
"no-duplicate-heading" : {
15+
"siblings_only" : true
16+
},
17+
"no-inline-html" : false
18+
}

‎box.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name":"ColdBox Validation",
33
"author":"Ortus Solutions <[email protected]>",
4-
"version":"4.4.0",
4+
"version":"4.5.0",
55
"location":"https://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbvalidation/@build.version@/[email protected]@.zip",
66
"slug":"cbvalidation",
77
"type":"modules",
@@ -26,6 +26,7 @@
2626
"cbi18n":"^3.0.0"
2727
},
2828
"devDependencies":{
29+
"commandbox-boxlang":"*",
2930
"commandbox-cfformat":"*",
3031
"commandbox-docbox":"*",
3132
"commandbox-dotenv":"*",
@@ -58,6 +59,5 @@
5859
"logs:2021":"server log [email protected] --follow"
5960
},
6061
"installPaths":{
61-
"cbi18n":"modules/cbi18n/"
6262
}
6363
}

‎build/Build.cfc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ component {
1212
variables.cwd = getCWD().reReplace( "\.$", "" );
1313
variables.artifactsDir = cwd & "/.artifacts";
1414
variables.buildDir = cwd & "/.tmp";
15+
variables.apidDocsDir = variables.buildDir & "/apidocs";
1516
variables.apiDocsURL = "http://localhost:60299/apidocs/";
1617
variables.testRunner = "http://localhost:60299/tests/runner.cfm";
1718

@@ -31,7 +32,8 @@ component {
3132
// Cleanup + Init Build Directories
3233
[
3334
variables.buildDir,
34-
variables.artifactsDir
35+
variables.artifactsDir,
36+
variables.apidDocsDir
3537
].each( function( item ){
3638
if ( directoryExists( item ) ) {
3739
directoryDelete( item, true );

0 commit comments

Comments
 (0)