From 7477fb23a418e6cdbfe6b1962b490263ca513169 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Fri, 19 May 2023 21:25:34 +0000 Subject: [PATCH 1/6] Version bump --- box.json | 2 +- changelog.md | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/box.json b/box.json index c108109..ed8c2ae 100644 --- a/box.json +++ b/box.json @@ -1,6 +1,6 @@ { "name":"Default ColdBox App Template", - "version":"7.3.0", + "version":"7.4.0", "author":"You", "location":"forgeboxStorage", "slug":"cbtemplate-advanced-script", diff --git a/changelog.md b/changelog.md index c2d0009..835b665 100644 --- a/changelog.md +++ b/changelog.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [7.3.0] - 2023-05-19 + ### Fixed - Changed `renderView()` to new standard of `view()` @@ -52,6 +54,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Docker build and compose consolidation to the `build` folder - Cleanup of `tests` to new standards -[Unreleased]: https://github.com/coldbox-templates/default/compare/v7.2.0...HEAD +[Unreleased]: https://github.com/coldbox-templates/default/compare/v7.3.0...HEAD + +[7.3.0]: https://github.com/coldbox-templates/default/compare/v7.2.0...v7.3.0 [7.2.0]: https://github.com/coldbox-templates/default/compare/4ff554bcb4383a973dbec39af57ce96667764cee...v7.2.0 From c865e8bcae6476fc9e902a4bc466035903f6125e Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Wed, 14 Jun 2023 16:03:21 +0200 Subject: [PATCH 2/6] adobe 2023 testing --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 234d3f7..3e2670f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ] + cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ] steps: - name: Checkout Repository uses: actions/checkout@v3.2.0 From 4ba08a66631f25ee94ef10bc59c8ab3d38728fab Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Wed, 14 Jun 2023 16:36:17 +0200 Subject: [PATCH 3/6] updated git ignore files to avoid config/modules issues --- .gitignore | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0f04594..d5f8e15 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,6 @@ npm-debug.log yarn-error.log ## Ignored Dependencies -coldbox/** -testbox/** -modules/** +/coldbox/** +/testbox/** +/modules/** From e0bcd46f66dfef319751941e5608582665a60edc Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Wed, 14 Jun 2023 16:39:01 +0200 Subject: [PATCH 4/6] updated changelogs --- changelog.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.md b/changelog.md index 835b665..47a91f1 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 + +- Gitignore updates so it doesn't ignore 'config/modules' + ## [7.3.0] - 2023-05-19 ### Fixed From a411285521cb12ed70df2ab638c0ddf107ad1e5a Mon Sep 17 00:00:00 2001 From: Luis Majano Date: Wed, 14 Jun 2023 17:02:03 +0200 Subject: [PATCH 5/6] updated snapshot auto formatting to use latest cfformat --- .github/workflows/snapshot.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index 1529541..2661786 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -22,10 +22,13 @@ jobs: steps: - uses: actions/checkout@v3 + - name: Setup CommandBox CLI + uses: Ortus-Solutions/setup-commandbox@v2.0.1 + - name: Auto-format - uses: Ortus-Solutions/commandbox-action@v1.0.2 - with: - cmd: run-script format + run: | + box install commandbox-cfformat + box run-script format - name: Commit Format Changes uses: stefanzweifel/git-auto-commit-action@v4 From 1aa57c6f7cff5d10a2e31512e864f87e33f1ecdf Mon Sep 17 00:00:00 2001 From: Jon Clausen Date: Thu, 19 Sep 2024 13:41:45 -0400 Subject: [PATCH 6/6] Fix errors in default testbox index file Fixes the following: * Links were directing back up to the root in modern browsers * Subdirectories did not have a path separator and would mash the directory with the parent directory --- tests/index.cfm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/index.cfm b/tests/index.cfm index 85a0e70..0d89a1e 100644 --- a/tests/index.cfm +++ b/tests/index.cfm @@ -40,9 +40,10 @@ + TestBox Browser - TestBox Browser + @@ -108,7 +109,7 @@ &##x271A; #qResults.name#