diff --git a/.github/README.md b/.github/README.md index ba4ffae..c042258 100644 --- a/.github/README.md +++ b/.github/README.md @@ -18,6 +18,11 @@ The following editors are currently supported: - Textstring - Textarea +> [!IMPORTANT] +> Version 13 will only receive security updates and no new features. + +> Please review the [security policy](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime?tab=security-ov-file#supported-versions) for more information. + ## Quick Start 1. Install the [NuGet package](https://www.nuget.org/packages/jcdcdev.Umbraco.ReadingTime) in your Umbraco CMS website project. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2847954..efc8f71 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,8 +7,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Build - uses: jcdcdev/jcdcdev.Umbraco.Github.Build@main + uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@v0 with: project-name: jcdcdev.Umbraco.ReadingTime project-path: src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj - umbraco-version: 13 \ No newline at end of file + umbraco-version: 13 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b274604..fac9bfb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,8 +2,8 @@ name: 🚀 Release on: workflow_dispatch: pull_request: - types: [ closed ] -jobs: + types: [closed] +jobs: release: if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' runs-on: ubuntu-latest @@ -13,15 +13,15 @@ jobs: steps: - name: Build id: build - uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@main + uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@v0 with: project-name: jcdcdev.Umbraco.ReadingTime project-path: src/jcdcdev.Umbraco.ReadingTime/jcdcdev.Umbraco.ReadingTime.csproj umbraco-version: 13 - name: Release - uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main + uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@v0 with: artifact-name: ${{ steps.build.outputs.artifact-name }} version: ${{ steps.build.outputs.version }} nuget-api-key: ${{ secrets.NUGET_API_KEY }} - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/GitVersion.yml b/GitVersion.yml new file mode 100644 index 0000000..c24489c --- /dev/null +++ b/GitVersion.yml @@ -0,0 +1,338 @@ +branches: + main: + regex: ^master$|^main$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["develop", "release"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + develop: + regex: ^dev(elop)?(ment)?$ + mode: ContinuousDeployment + tag: alpha + increment: Minor + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + release: + regex: ^releases?[/-] + mode: ContinuousDelivery + tag: beta + increment: None + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["develop", "main", "support", "release"] + tracks-release-branches: false + is-release-branch: true + is-mainline: false + pre-release-weight: 30000 + feature: + regex: ^features?[/-] + mode: ContinuousDelivery + tag: useBranchName + increment: Inherit + prevent-increment-of-merged-branch-version: false + track-merge-target: false + source-branches: + ["develop", "main", "release", "feature", "support", "hotfix"] + tracks-release-branches: false + is-release-branch: false + is-mainline: false + pre-release-weight: 30000 + pull-request: + regex: ^(pull|pull\-requests|pr)[/-] + mode: ContinuousDelivery + tag: PullRequest + increment: Inherit + prevent-increment-of-merged-branch-version: false + tag-number-pattern: '[/-](?\d+)[-/]' + track-merge-target: false + source-branches: + ["develop", "main", "release", "feature", "support", "hotfix"] + tracks-release-branches: false + is-release-branch: false + is-mainline: false + pre-release-weight: 30000 + hotfix: + regex: ^hotfix(es)?[/-] + mode: ContinuousDelivery + tag: beta + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: false + source-branches: ["develop", "main", "support"] + tracks-release-branches: false + is-release-branch: false + is-mainline: false + pre-release-weight: 30000 + support: + regex: ^support[/-] + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["main"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-10: + regex: ^v10$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-10"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-12: + regex: ^v12$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-12"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-13: + regex: ^v13$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-13"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-14: + regex: ^v14$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-14"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-develop-10: + regex: ^dev/v10$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-10"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-develop-12: + regex: ^dev/v12$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-12"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-develop-13: + regex: ^dev/v13$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-13"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-develop-14: + regex: ^dev/v14$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-14"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-15: + regex: ^v15$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-15"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-develop-15: + regex: ^dev/v15$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-15"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-16: + regex: ^v16$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-16"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-develop-16: + regex: ^dev/v16$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-16"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-17: + regex: ^v17$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-17"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-develop-17: + regex: ^dev/v17$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-17"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-18: + regex: ^v18$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-18"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-develop-18: + regex: ^dev/v18$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-18"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-19: + regex: ^v19$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-19"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-develop-19: + regex: ^dev/v19$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-19"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 + version-20: + regex: ^v20$ + mode: ContinuousDelivery + tag: "" + increment: Patch + prevent-increment-of-merged-branch-version: true + track-merge-target: false + source-branches: ["version-develop-20"] + tracks-release-branches: false + is-release-branch: false + is-mainline: true + pre-release-weight: 55000 + version-develop-20: + regex: ^dev/v20$ + mode: ContinuousDeployment + tag: alpha + increment: Patch + prevent-increment-of-merged-branch-version: false + track-merge-target: true + source-branches: [] + is-source-branch-for: ["version-20"] + tracks-release-branches: true + is-release-branch: false + is-mainline: false + pre-release-weight: 0 diff --git a/SECURITY.md b/SECURITY.md index 3108d8a..6499197 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,8 +10,8 @@ The following table outlines the versions of the project that are currently supp | Package Version | Umbraco Version | Security Phase Start | End of Life | | ---------------------------------------------------------------------------------- | --------------- | -------------------- | ----------- | | [13.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v13) | 13 | 2025-12-14 | 2026-12-14 | -| [15.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v15) | 15 | 2025-08-14 | 2025-11-14 | -| [16.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v16) | 16 | 2026-03-12 | 2026-06-12 | +| [16.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v16) | 16 | 2026-03-12 | 2026-06-12 | +| [17.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v17) | 17 | 2027-11-27 | 2028-11-27 | ## Unsupported Versions | Package Version | Umbraco Version | End of Life | @@ -19,6 +19,7 @@ The following table outlines the versions of the project that are currently supp | [10.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v10) | 10 | 2025-06-16 | | [12.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v12) | 12 | 2024-06-29 | | [14.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v14) | 14 | 2025-05-30 | +| [15.x](https://github.com/jcdcdev/jcdcdev.Umbraco.ReadingTime/tree/v15) | 15 | 2025-11-14 | ## Future Support diff --git a/src/TestSite.13/TestSite.13.csproj b/src/TestSite.13/TestSite.13.csproj index f64303f..e626487 100644 --- a/src/TestSite.13/TestSite.13.csproj +++ b/src/TestSite.13/TestSite.13.csproj @@ -7,7 +7,7 @@ - +