boxlang cert

coldbox-modules · Feb 20, 2025 · b8260c7 · b8260c7
1 parent 37bbcdd
commit b8260c7
Show file tree

Hide file tree

Showing 15 changed files with 151 additions and 83 deletions.
diff --git a/.github/workflows/cron.yml b/.github/workflows/cron.yml
@@ -0,0 +1,10 @@
+name: Daily Tests
+
+on:
+  schedule:
+    - cron: '0 0 * * *'  # Runs at 00:00 UTC every day
+
+jobs:
+  tests:
+    uses: ./.github/workflows/tests.yml
+    secrets: inherit
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -6,18 +6,17 @@ on:
       - "main"
       - "master"
       - "development"
-      - "releases/v*"
   pull_request:
     branches:
-      - "releases/v*"
       - development
 
 jobs:
   tests:
     uses: ./.github/workflows/tests.yml
     secrets: inherit
 
-  formatCheck:
+  # Format PR
+  format_check:
     name: Checks Source Code Formatting
     runs-on: ubuntu-24.04
     steps:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -16,9 +16,13 @@ on:
           default: false
           type: boolean
 
+  # Manual Trigger
+  workflow_dispatch:
 env:
-  MODULE_ID: cbmailservices
+  MODULE_ID: ${{ github.event.repository.name }}
+  JDK: 21
   SNAPSHOT: ${{ inputs.snapshot || false }}
+  BUILD_ID: ${{ github.run_number }}
 
 jobs:
   ##########################################################################################
@@ -27,6 +31,11 @@ jobs:
   build:
     name: Build & Publish
     runs-on: ubuntu-24.04
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: write
+      issues: write
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
@@ -36,6 +45,12 @@ jobs:
         with:
           forgeboxAPIKey: ${{ secrets.FORGEBOX_TOKEN }}
 
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: "temurin"
+          java-version: ${{ env.JDK }}
+
       - name: "Setup Environment Variables For Build Process"
         id: current_version
         run: |
@@ -61,10 +76,10 @@ jobs:
           npm install -g markdownlint-cli
           markdownlint changelog.md --fix
           box install commandbox-docbox
-          box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
+          box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ env.BUILD_ID }} :branch=${{ env.BRANCH }}
 
-      - name: Commit Changelog To Master
-        uses: EndBug/[email protected].1
+      - name: Commit Changelog [unreleased] with latest version
+        uses: EndBug/[email protected].4
         if: env.SNAPSHOT == 'false'
         with:
           author_name: Github Actions
@@ -73,7 +88,7 @@ jobs:
           add: changelog.md
 
       - name: Tag Version
-        uses: rickstaa/action-create-tag@v1.6.1
+        uses: rickstaa/action-create-tag@v1.7.2
         if: env.SNAPSHOT == 'false'
         with:
           tag: "v${{ env.VERSION }}"
@@ -127,6 +142,18 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           ref: refs/tags/v${{ env.VERSION }}
 
+      - name: Inform Slack
+        if: ${{ always() }}
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: coding
+          SLACK_COLOR: ${{ job.status }} # or a specific color like 'green' or '#ff00ff'
+          SLACK_ICON_EMOJI: ":bell:"
+          SLACK_MESSAGE: "Module ${{ env.MODULE_ID }} v${{ env.VERSION }} Built with ${{ job.status }}!"
+          SLACK_TITLE: "ColdBox Module ${{ env.MODULE_ID }}"
+          SLACK_USERNAME: CI
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
+
   ##########################################################################################
   # Prep Next Release
   ##########################################################################################
@@ -135,6 +162,11 @@ jobs:
     if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main'
     runs-on: ubuntu-24.04
     needs: [ build ]
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: write
+      issues: write
     steps:
       # Checkout development
       - name: Checkout Repository
@@ -165,7 +197,7 @@ jobs:
 
       # Commit it back to development
       - name: Commit Version Bump
-        uses: EndBug/[email protected].1
+        uses: EndBug/[email protected].4
         with:
           author_name: Github Actions
           author_email: [email protected]

diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml
@@ -4,8 +4,14 @@ on:
   push:
     branches:
       - 'development'
+
   workflow_dispatch:
 
+# Unique group name per workflow-branch/tag combo
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 jobs:
   ##########################################################################################
   # Module Tests
@@ -20,6 +26,9 @@ jobs:
   format:
     name: Code Auto-Formatting
     runs-on: ubuntu-24.04
+    permissions:
+      contents: write
+      checks: write
     steps:
       - uses: actions/checkout@v4
 
@@ -29,7 +38,7 @@ jobs:
           cmd: run-script format
 
       - name: Commit Format Changes
-        uses: stefanzweifel/git-auto-commit-action@v4
+        uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Apply cfformat changes
 
@@ -40,5 +49,10 @@ jobs:
     uses: ./.github/workflows/release.yml
     needs: [ tests, format ]
     secrets: inherit
+    permissions:
+      checks: write
+      pull-requests: write
+      contents: write
+      issues: write
     with:
       snapshot: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -18,43 +18,42 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
-        coldboxVersion: [ "^6.0.0" ]
+        cfengine: [ "boxlang-cfml@1", "lucee@5", "lucee@6", "adobe@2021", "adobe@2023" ]
+        coldboxVersion: [ "^7.0.0" ]
         experimental: [ false ]
+        # Experimental: ColdBox BE vs All Engines
         include:
-          - cfengine: "adobe@2023"
-            coldboxVersion: "^6.0.0"
-            experimental: true
           - coldboxVersion: "be"
             cfengine: "lucee@5"
             experimental: true
           - coldboxVersion: "be"
-            cfengine: "adobe@2018"
+            cfengine: "lucee@6"
             experimental: true
           - coldboxVersion: "be"
             cfengine: "adobe@2021"
             experimental: true
           - coldboxVersion: "be"
-            cfengine: "boxlang@1"
+            cfengine: "adobe@2023"
+            experimental: true
+          - coldboxVersion: "be"
+            cfengine: "boxlang-cfml@1"
             experimental: true
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
+      # DATABASE SETUP: uncomment if you need to setup a database
+      # - name: Setup Database and Fixtures
+      #   run: |
+      #     sudo systemctl start mysql.service
+      #     mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE mementifier;'
+      #     mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/coolblog.sql
 
       - name: Setup Java
         uses: actions/setup-java@v4
         with:
           distribution: "temurin"
-          java-version: "11"
-
-      # - name: Setup Database and Fixtures
-      #   run: |
-      #     sudo systemctl start mysql.service
-      #     # Create Database
-      #     #mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} -e 'CREATE DATABASE cbsecurity;'
-      #     # Import Database
-      #     mysql -u${{ env.DB_USER }} -p${{ env.DB_PASSWORD }} < test-harness/tests/resources/cbsecurity.sql
+          java-version: "21"
 
       - name: Setup Environment For Testing Process
         run: |
@@ -72,11 +71,6 @@ jobs:
       - name: Setup CommandBox CLI
         uses: Ortus-Solutions/[email protected]
 
-      - name: Update Commandbox Boxlang Module
-        if: ${{ matrix.cfengine == 'boxlang@1' }}
-        run:
-          box install --force commandbox-boxlang
-
       - name: Install Dependencies
         run: |
           box install

diff --git a/.markdownlint.json b/.markdownlint.json
@@ -11,5 +11,6 @@
 	"no-duplicate-header" : {
 		"siblings_only" : true
 	},
+	"no-duplicate-heading" : false,
 	"no-inline-html" : false
 }
diff --git a/box.json b/box.json
@@ -24,10 +24,9 @@
         "Curt Gratz <[email protected]>"
     ],
     "devDependencies":{
+		"commandbox-boxlang":"*",
         "commandbox-cfformat":"*",
-        "commandbox-docbox":"*",
-        "commandbox-dotenv":"*",
-        "commandbox-cfconfig":"*"
+        "commandbox-docbox":"*"
     },
     "ignore":[
         "**/.*",
@@ -44,13 +43,10 @@
         "format:check":"cfformat check handlers/,interceptors/,models/,test-harness/tests/specs,ModuleConfig.cfc ./.cfformat.json",
         "start:fakemail":"!docker compose -f test-harness/tests/resources/docker-compose.yml up --detach",
         "start:lucee":"server start [email protected]",
-        "start:2018":"server start [email protected]",
         "start:2021":"server start [email protected]",
         "stop:lucee":"server stop [email protected]",
-        "stop:2018":"server stop [email protected]",
         "stop:2021":"server stop [email protected]",
         "logs:lucee":"server log [email protected] --follow",
-        "logs:2018":"server log [email protected] --follow",
         "logs:2021":"server log [email protected] --follow"
     },
     "testbox":{

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
@@ -9,6 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- BoxLang certification
+- Github Actions updates
+
 ## [2.8.0] - 2023-09-13
 
 ### Added

diff --git a/readme.md b/readme.md
@@ -1,3 +1,20 @@
+<p align="center">
+	<img src="https://www.ortussolutions.com/__media/coldbox-185-logo.png">
+	<br>
+	<img src="https://www.ortussolutions.com/__media/wirebox-185.png" height="125">
+	<img src="https://www.ortussolutions.com/__media/cachebox-185.png" height="125" >
+	<img src="https://www.ortussolutions.com/__media/logbox-185.png"  height="125">
+</p>
+
+<p align="center">
+	Copyright Since 2005 ColdBox Platform by Luis Majano and Ortus Solutions, Corp
+	<br>
+	<a href="https://www.coldbox.org">www.coldbox.org</a> |
+	<a href="https://www.ortussolutions.com">www.ortussolutions.com</a>
+</p>
+
+----
+
 # Welcome to the ColdBox Mail Services => (`cbmailservices`)
 
 Sending email doesn't have to be complicated or archaic or sad 😭. The ColdBox Mail Services (`cbmailservices`) module will allow you to send email in a fluent and abstracted way in multiple protocols for many environments in a single cohesive API, which will bring you smiles 😍, rainbows 🌈 and unicorns 🦄!. The supported protocols are:
@@ -54,8 +71,9 @@ Apache License, Version 2.0.
 
 ## SYSTEM REQUIREMENTS
 
+* BoxLang 1+
 * Lucee 5+
-* ColdFusion 2018+
+* ColdFusion 2021+
 
 
 ********************************************************************************

diff --git a/[email protected] b/[email protected]
@@ -1,8 +1,8 @@
 {
-    "name":"@MODULE_NAME@-adobe@2023",
+    "name":"cbmailservices-adobe@2023",
     "app":{
         "serverHomeDirectory":".engine/adobe2023",
-        "cfengine":"adobe@2023.0.0-beta.1"
+        "cfengine":"adobe@2023"
     },
     "web":{
         "http":{
@@ -13,7 +13,7 @@
         },
 		"webroot": "test-harness",
 		"aliases":{
-            "/moduleroot/@MODULE_NAME@":"../"
+            "/moduleroot/cbmailservices":"../"
         }
     },
     "jvm":{
@@ -24,6 +24,6 @@
 		"file" : ".cfconfig.json"
 	},
     "scripts" : {
-        "onServerInstall":"cfpm install zip,debugger,mail"
+        "onServerInstall":"cfpm install zip,debugger"
     }
 }