From ace5210c69856c93e25edac5f116b025246ac34c Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 13 Feb 2024 14:48:22 +0000 Subject: [PATCH 1/4] Version bump --- box.json | 12 ++++++------ changelog.md | 30 ++++++++++++++++++------------ 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/box.json b/box.json index 1176976..ab368ae 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"DocBox", - "version":"4.1.0", + "version":"4.2.0", "author":"Ortus Solutions, Corp", "location":"http://downloads.ortussolutions.com/ortussolutions/docbox/@build.version@/docbox-@build.version@.zip", "homepage":"https://forgebox.io/view/docbox", @@ -25,8 +25,8 @@ "Brad Wood " ], "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/changelog.md b/changelog.md index b54e245..e9d5f8e 100644 --- a/changelog.md +++ b/changelog.md @@ -5,10 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ----- +* * * ## [Unreleased] +## [4.1.0] - 2024-02-13 + ### Added - Adobe 2023 Testing and Support @@ -56,7 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixed failing XMI strategy ----- +* * * ## [2.2.1] @@ -64,7 +66,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Bug on DocBox tracing errors, left over a couple of `()` ----- +* * * ## [2.2.0] @@ -74,7 +76,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added `@throws` annotation to function definitions - Added `@deprecated` annotation to function definitions ----- +* * * ## [2.1.0] @@ -84,7 +86,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - BUGFIX: Missing pound sign in ExpandPath(), added better wording for custom strategy path - Fix cleanPath without a leading slash with regex updates ----- +* * * ## [2.0.7] @@ -92,7 +94,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Build process messed up folder structure. Basically 2.0.6 was unusable ----- +* * * ## [2.0.6] @@ -108,7 +110,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Travis integration ----- +* * * ## [2.0.5] @@ -116,7 +118,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Moved CommandBox command to its own repo ----- +* * * ## [2.0.4] @@ -124,7 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Update package directory and location for CommandBox command ----- +* * * ## [2.0.3] @@ -132,7 +134,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - FireFox location bug ----- +* * * ## [2.0.2] @@ -144,7 +146,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Updates on box.json for standalone installations ----- +* * * ## [2.0.1] @@ -152,10 +154,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Fixes for ACF ----- +* * * ## [2.0.0] ### Improved - Updated to DocBox styles + +[Unreleased]: https://github.com/Ortus-Solutions/DocBox/compare/v4.1.0...HEAD + +[4.1.0]: https://github.com/Ortus-Solutions/DocBox/compare/e6d838c31f224f6a162e95612762f8fa9ee87280...v4.1.0 From b33352a9cd60b279445252b82fed4313fcde836d Mon Sep 17 00:00:00 2001 From: Michael Born Date: Tue, 13 Feb 2024 11:43:32 -0500 Subject: [PATCH 2/4] Set up github pages redirect to gitbook --- build/Build.cfc | 3 ++- pages/_config.yml | 1 + pages/index.html | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 pages/_config.yml create mode 100644 pages/index.html diff --git a/build/Build.cfc b/build/Build.cfc index ab61e8b..a4db472 100644 --- 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", + "pages" ]; // Cleanup + Init Build Directories diff --git a/pages/_config.yml b/pages/_config.yml new file mode 100644 index 0000000..c419263 --- /dev/null +++ b/pages/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-cayman \ No newline at end of file diff --git a/pages/index.html b/pages/index.html new file mode 100644 index 0000000..a866ab7 --- /dev/null +++ b/pages/index.html @@ -0,0 +1,6 @@ + + + +Redirecting to https://docbox.ortusbooks.com + + From 98a306a71a31f6e1b13e41c18197a178aecc4bbc Mon Sep 17 00:00:00 2001 From: Michael Born Date: Tue, 13 Feb 2024 11:46:55 -0500 Subject: [PATCH 3/4] Move GH pages to docs/ directory --- build/Build.cfc | 2 +- {pages => docs}/_config.yml | 0 {pages => docs}/index.html | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename {pages => docs}/_config.yml (100%) rename {pages => docs}/index.html (100%) diff --git a/build/Build.cfc b/build/Build.cfc index a4db472..a263299 100644 --- a/build/Build.cfc +++ b/build/Build.cfc @@ -21,7 +21,7 @@ component { "server-.*\.json", "^\..*", "coldbox-5-router-documentation.png", - "pages" + "docs" ]; // Cleanup + Init Build Directories diff --git a/pages/_config.yml b/docs/_config.yml similarity index 100% rename from pages/_config.yml rename to docs/_config.yml diff --git a/pages/index.html b/docs/index.html similarity index 100% rename from pages/index.html rename to docs/index.html From 11ec514ac43c72e24a7e8f6a249fd86c093407e5 Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Tue, 13 Feb 2024 21:24:26 +0100 Subject: [PATCH 4/4] - Missed branch identifier in build process --- .github/workflows/release.yml | 2 +- box.json | 2 +- changelog.md | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d61ef2..c284151 100644 --- 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/add-and-commit@v9.1.4 diff --git a/box.json b/box.json index ab368ae..d9215cf 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"DocBox", - "version":"4.2.0", + "version":"4.1.1", "author":"Ortus Solutions, Corp", "location":"http://downloads.ortussolutions.com/ortussolutions/docbox/@build.version@/docbox-@build.version@.zip", "homepage":"https://forgebox.io/view/docbox", diff --git a/changelog.md b/changelog.md index e9d5f8e..df63419 100644 --- 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