Merge branch 'development'

Ortus-Solutions · Feb 13, 2024 · 2b09383 · 2b09383
2 parents 8e6cf90 + 11ec514
commit 2b09383
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -74,7 +74,7 @@ jobs:
           npm install -g markdownlint-cli
           markdownlint changelog.md --fix
           # Build it
-          box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }}
+          box task run taskfile=build/Build target=run :version=${{ env.VERSION }} :projectName=${{ env.MODULE_ID }} :buildID=${{ github.run_number }} :branch=${{ env.BRANCH }}
 
       - name: Commit Changelog [unreleased] with latest version
         uses: EndBug/[email protected]

diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"DocBox",
-    "version":"4.1.0",
+    "version":"4.1.1",
     "author":"Ortus Solutions, Corp",
     "location":"http://downloads.ortussolutions.com/ortussolutions/docbox/@build.version@/[email protected]@.zip",
     "homepage":"https://forgebox.io/view/docbox",
@@ -25,8 +25,8 @@
         "Brad Wood <[email protected]>"
     ],
     "dependencies":{
-		"commandbox-cfformat":"*"
-	},
+        "commandbox-cfformat":"*"
+    },
     "devDependencies":{
         "testbox":"^5"
     },
@@ -41,9 +41,9 @@
         "coldbox-5-router-documentation.png"
     ],
     "scripts":{
-		"build":"task run taskFile=build/Build.cfc :projectName=docbox :version=`package show version`",
-		"build:docs" : "task run build/Docs.cfc",
-		"tests" : "task run taskFile=build/Build.cfc target=runTests",
+        "build":"task run taskFile=build/Build.cfc :projectName=docbox :version=`package show version`",
+        "build:docs":"task run build/Docs.cfc",
+        "tests":"task run taskFile=build/Build.cfc target=runTests",
         "release":"recipe build/release.boxr",
         "format":"cfformat run --overwrite DocBox.cfc,build,strategy,tests",
         "format:watch":"cfformat watch DocBox.cfc,build,strategy,tests ./.cfformat.json",

diff --git a/build/Build.cfc b/build/Build.cfc
@@ -20,7 +20,8 @@ component {
 			"tests",
 			"server-.*\.json",
 			"^\..*",
-			"coldbox-5-router-documentation.png"
+			"coldbox-5-router-documentation.png",
+			"docs"
 		];
 
 		// Cleanup + Init Build Directories

diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Missed branch identifier in build process
+
 ## [4.1.0] - 2024-02-13
 
 ### Added

diff --git a/docs/_config.yml b/docs/_config.yml
@@ -0,0 +1 @@
+theme: jekyll-theme-cayman
diff --git a/docs/index.html b/docs/index.html
@@ -0,0 +1,6 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<!-- Thanks: https://dev.to/steveblue/setup-a-redirect-on-github-pages-1ok7 -->
+<title>Redirecting to https://docbox.ortusbooks.com</title>
+<meta http-equiv="refresh" content="0; URL=https://docbox.ortusbooks.com">
+<link rel="canonical" href="https://docbox.ortusbooks.com">