- Github actions updates

- ColdBox 7 auto testing - Markdown linting
coldbox-modules · May 9, 2024 · 5b535fd · 5b535fd
1 parent 4437654
commit 5b535fd
Show file tree

Hide file tree

Showing 11 changed files with 117 additions and 85 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - uses: Ortus-Solutions/[email protected]
         with:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup CommandBox
         uses: Ortus-Solutions/[email protected]
@@ -82,7 +82,7 @@ jobs:
 
       - name: Upload Build Artifacts
         if: success()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.MODULE_ID }}
           path: |
@@ -138,7 +138,7 @@ jobs:
     steps:
       # Checkout development
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: development
 

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -20,7 +20,7 @@ jobs:
     name: Code Auto-Formatting
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Auto-format
         uses: Ortus-Solutions/[email protected]

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,25 +18,28 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
-        coldboxVersion: [ "^6.0.0" ]
+        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
+        coldboxVersion: [ "^6.0.0", "^7.0.0" ]
         experimental: [ false ]
         include:
-          - cfengine: "adobe@2023"
-            coldboxVersion: "^6.0.0"
-            experimental: true
           - coldboxVersion: "be"
             cfengine: "lucee@5"
             experimental: true
+          - coldboxVersion: "be"
+            cfengine: "lucee@6"
+            experimental: true
           - coldboxVersion: "be"
             cfengine: "adobe@2018"
             experimental: true
           - coldboxVersion: "be"
             cfengine: "adobe@2021"
             experimental: true
+          - coldboxVersion: "be"
+            cfengine: "adobe@2023"
+            experimental: true
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Not Needed in this module
       #- name: Setup Database and Fixtures
@@ -96,7 +99,7 @@ jobs:
 
       - name: Upload Test Results to Artifacts
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-results-${{ matrix.cfengine }}-${{ matrix.coldboxVersion }}
           path: |
@@ -109,7 +112,7 @@ jobs:
 
       - name: Upload Debug Logs To Artifacts
         if: ${{ failure() }}
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: Failure Debugging Info - ${{ matrix.cfengine }} - ${{ matrix.coldboxVersion }}
           path: |

diff --git a/.markdownlint.json b/.markdownlint.json
@@ -10,5 +10,7 @@
 	},
 	"no-duplicate-header" : {
 		"siblings_only" : true
-	}
-}
+	},
+	"no-duplicate-heading" : false,
+	"no-inline-html" : false
+}
diff --git a/build/Build.cfc b/build/Build.cfc
@@ -12,6 +12,7 @@ component {
 		variables.cwd          = getCWD().reReplace( "\.$", "" );
 		variables.artifactsDir = cwd & "/.artifacts";
 		variables.buildDir     = cwd & "/.tmp";
+		variables.apidDocsDir = variables.buildDir & "/apidocs";
 		variables.apiDocsURL   = "http://localhost:60299/apidocs/";
 		variables.testRunner   = "http://localhost:60299/tests/runner.cfm";
 
@@ -31,7 +32,8 @@ component {
 		// Cleanup + Init Build Directories
 		[
 			variables.buildDir,
-			variables.artifactsDir
+			variables.artifactsDir,
+			variables.apidDocsDir
 		].each( function( item ){
 			if ( directoryExists( item ) ) {
 				directoryDelete( item, true );

diff --git a/changelog.md b/changelog.md
@@ -11,102 +11,104 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Build Updates
 - Github actions updates
 - ColdBox 7 auto testing
+- Markdown linting
 
 ## [3.6.0] => 2022-SEP-22
 
 ### Added
 
-* New module layout
+- New module layout
 
 ### Fixed
 
-* DateRanges
+- DateRanges
 
 ## [3.5.0] => 2022-JAN-11
 
 ### Added
 
-* Github actions migration
-* Formatting and code quality rules
-* `guid` generator thanks to @djcard
+- Github actions migration
+- Formatting and code quality rules
+- `guid` generator thanks to @djcard
 
 ## [3.4.0] => 2020-JUN-03
 
 ### Added
 
-* `string` type re-architected to produce more randomness and more permutations according to our new generation pattern: `string[-(secure|alpha|numeric):max]` #6
-* More formatting rules
-* Changelog standards
-* Auto publishing to github (artifacts and changelogs)
-* Types are now case-insensitive when called: `num,oneof,lorem,baconlorem,sentence,words`  #5
-* `generateFakeData()` is now public
-* All generators can now be called individually by function name
-* `lorem,baconlorem,words,sentence` you can now produce random sizes with them via `min:max` notation
-* Optimized generation by using arrays instead of strings
-* Included libraries for nouns and adjectives
+- `string` type re-architected to produce more randomness and more permutations according to our new generation pattern: `string[-(secure|alpha|numeric):max]` #6
+- More formatting rules
+- Changelog standards
+- Auto publishing to github (artifacts and changelogs)
+- Types are now case-insensitive when called: `num,oneof,lorem,baconlorem,sentence,words`  #5
+- `generateFakeData()` is now public
+- All generators can now be called individually by function name
+- `lorem,baconlorem,words,sentence` you can now produce random sizes with them via `min:max` notation
+- Optimized generation by using arrays instead of strings
+- Included libraries for nouns and adjectives
 
 ### Changed
 
-* Access variables according to scopes instead of lookup
-* Internal data generation names to avoid method conflicts
+- Access variables according to scopes instead of lookup
+- Internal data generation names to avoid method conflicts
 
 ### Fixed
 
-* Access variables according to scopes
-* `$returnType` is not documented #8
+- Access variables according to scopes
+- `$returnType` is not documented #8
 
 ## [3.3.1] => 2020-APR-16
 
 ### Fixed
 
-* param the default method when executing via URL instead of setting it.
+- param the default method when executing via URL instead of setting it.
 
 ## [3.3.0] => 2020-JAN-28
 
 ### New Features
 
-* `ipaddress` : Generates an ipv4 address
-* New type: `string` which generates random hash strings of certain length. Default is 10 characters.
-* New type: `website` to generate random protocol based websites
-* New type: `website_http` to generate `http` only based websites
-* New type: `website_https` to generate `https` only based websites
-* New type: `imageurl` : Generates a random image URL with a random protocol
-* New type: `imageurl_http` : Generates a random image URL with `http` only protocol
-* New type: `imageurl_https` : Generates a random image URL with `https` only protocol
-* New type: `url` : Generates a random URL with a random protocol
-* New type: `url_http` : Generates a random URL with `http` only protocol
-* New type: `url_https` : Generates a random URL with `https` only protocol
+- `ipaddress` : Generates an ipv4 address
+- New type: `string` which generates random hash strings of certain length. Default is 10 characters.
+- New type: `website` to generate random protocol based websites
+- New type: `website_http` to generate `http` only based websites
+- New type: `website_https` to generate `https` only based websites
+- New type: `imageurl` : Generates a random image URL with a random protocol
+- New type: `imageurl_http` : Generates a random image URL with `http` only protocol
+- New type: `imageurl_https` : Generates a random image URL with `https` only protocol
+- New type: `url` : Generates a random URL with a random protocol
+- New type: `url_http` : Generates a random URL with `http` only protocol
+- New type: `url_https` : Generates a random URL with `https` only protocol
 
 ### Improvements
 
-* Added new domains for more random generation
-* Removed spacing from words
+- Added new domains for more random generation
+- Removed spacing from words
 
 ## [3.2.0] => 2020-JAN-08
 
 ### New Features
 
-* Added the ability for a type to be a closure/lambda to act as a supplier. This way, this function will be called every time for you to supply the result.  It receives the current iterating `index` as well: `function( index ){}`
+- Added the ability for a type to be a closure/lambda to act as a supplier. This way, this function will be called every time for you to supply the result.  It receives the current iterating `index` as well: `function( index ){}`
 
 ### Improvements
 
-* Formatting of source via cfformat
-* Fixes for api doc creations to use the project mapping
-* Functional update of json service to filter out reserved rc keys
-* TestBox 3 upgrade
-* More direct scoping of the arguments scope
+- Formatting of source via cfformat
+- Fixes for api doc creations to use the project mapping
+- Functional update of json service to filter out reserved rc keys
+- TestBox 3 upgrade
+- More direct scoping of the arguments scope
 
 ## [3.1.0] => 2019-MAY-19
 
-* CommandBox ability to execute
-* Template updates to standards
+- CommandBox ability to execute
+- Template updates to standards
 
 ## [3.0.0] => 2018-SEP-4
 
-* **Compatibility** : `num` arguments have been dropped and you must use `$num` as the identifier for how many items you like
-* Introduction of nested mocking. You can now declare nested mocks as structs and the mock data will nest accordingly:
+- **Compatibility** : `num` arguments have been dropped and you must use `$num` as the identifier for how many items you like
+- Introduction of nested mocking. You can now declare nested mocks as structs and the mock data will nest accordingly:
 
 ```js
 getInstance( "MockData@MockDataCFC" )
@@ -126,36 +128,36 @@ getInstance( "MockData@MockDataCFC" )
 
 This will produce top level mock data with 2 books per record.
 
-* Nested Data for array of objects, array of values and simple objects
-* ACF Compatibilities
-* Updated readmes and syntax updates for modern engines
-* Upgraded to new ColdBox module Harness
+- Nested Data for array of objects, array of values and simple objects
+- ACF Compatibilities
+- Updated readmes and syntax updates for modern engines
+- Upgraded to new ColdBox module Harness
 
 ## [2.4.0]
 
-* Added auto-incrementing ID's FOR REAL this time
+- Added auto-incrementing ID's FOR REAL this time
 
 ## [2.3.0]
 
-* Added auto-incrementing ID's
-* Update on build control
-* Syntax Ortus Updates, addition of private methods
-* allow for use of `rand` or `rnd` for `num` generators
-* Add CORS support for ColdBox REST Module
-* Bug on `isDefault()` always returning true.
-* Added tests and automation
+- Added auto-incrementing ID's
+- Update on build control
+- Syntax Ortus Updates, addition of private methods
+- allow for use of `rand` or `rnd` for `num` generators
+- Add CORS support for ColdBox REST Module
+- Bug on `isDefault()` always returning true.
+- Added tests and automation
 
 ## [2.2.0]
 
-* Made it a module as well for ColdBox apps.
+- Made it a module as well for ColdBox apps.
 
 ## [2.0.0]
 
-* Added support for words, sentences, uuid, bacon lorem, date and datetime
-* Added CommandBox Support
-* Added Documentation
-* Added ability to execute as a CFC instead of only via web service
+- Added support for words, sentences, uuid, bacon lorem, date and datetime
+- Added CommandBox Support
+- Added Documentation
+- Added ability to execute as a CFC instead of only via web service
 
 ## [1.0.0]
 
-Original by Ray Camden
+- Original by Ray Camden
diff --git a/[email protected] b/[email protected]
@@ -2,7 +2,7 @@
     "name":"MockDataCFC-adobe@2023",
     "app":{
         "serverHomeDirectory":".engine/adobe2023",
-        "cfengine":"adobe@2023.0.0-beta.1"
+        "cfengine":"adobe@2023"
     },
     "web":{
         "http":{

diff --git a/[email protected] b/[email protected]
@@ -0,0 +1,23 @@
+{
+    "name":"mockdatacfc-lucee@6",
+    "app":{
+        "serverHomeDirectory":".engine/lucee6",
+        "cfengine":"lucee@6"
+    },
+    "web":{
+        "http":{
+            "port":"60299"
+        },
+        "rewrites":{
+            "enable":"true"
+        },
+        "webroot":"test-harness",
+        "aliases":{
+            "/moduleroot/MockDataCFC":"../"
+        }
+    },
+    "openBrowser":"false",
+    "cfconfig":{
+        "file":".cfconfig.json"
+    }
+}
diff --git a/test-harness/box.json b/test-harness/box.json
@@ -5,7 +5,7 @@
     "private":true,
     "description":"",
     "dependencies":{
-        "coldbox":"^6.0.0"
+        "coldbox":"^7.0.0"
     },
     "devDependencies":{
         "testbox":"*"

diff --git a/test-harness/layouts/Main.cfm b/test-harness/layouts/Main.cfm
@@ -1,6 +1,6 @@
-<cfoutput>
-<h1>Module Tester</h1>
-<div>
-	#renderView()#
-</div>
-</cfoutput>
+<cfoutput>
+<h1>Module Tester</h1>
+<div>
+	#view()#
+</div>
+</cfoutput>