diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0878d4d..ad5efb7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ 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.ExtendedMarkdownEditor project-path: src/jcdcdev.Umbraco.ExtendedMarkdownEditor/jcdcdev.Umbraco.ExtendedMarkdownEditor.csproj @@ -15,4 +15,4 @@ jobs: npm-enabled: true npm-version: "22.x" umbraco-version: 16 - dotnet-version: "9" \ No newline at end of file + dotnet-version: "9" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e96185..c7f8a6c 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,7 +13,7 @@ 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.ExtendedMarkdownEditor project-path: src/jcdcdev.Umbraco.ExtendedMarkdownEditor/jcdcdev.Umbraco.ExtendedMarkdownEditor.csproj @@ -23,9 +23,9 @@ jobs: umbraco-version: 16 dotnet-version: "9" - 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/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package-lock.json b/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package-lock.json index 296b886..4774b20 100644 --- a/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package-lock.json +++ b/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package-lock.json @@ -11,9 +11,9 @@ "lit": "^3.3.1" }, "devDependencies": { - "@umbraco-cms/backoffice": "^16.3.1", + "@umbraco-cms/backoffice": "^16.3.3", "typescript": "^5.9.3", - "vite": "^7.1.12" + "vite": "^7.2.2" } }, "node_modules/@esbuild/aix-ppc64": { @@ -1491,9 +1491,9 @@ "license": "MIT" }, "node_modules/@umbraco-cms/backoffice": { - "version": "16.3.1", - "resolved": "https://registry.npmjs.org/@umbraco-cms/backoffice/-/backoffice-16.3.1.tgz", - "integrity": "sha512-Ja4Wmjh0FFAxSpo40CN7OrRYlfUlCoyY4Mek0pX5K82AVt2eZtAl4mjgVufUetxChLnxEdV66a5rpblBgE/83w==", + "version": "16.3.3", + "resolved": "https://registry.npmjs.org/@umbraco-cms/backoffice/-/backoffice-16.3.3.tgz", + "integrity": "sha512-tTJubWHez2QWMbpb5MO/0e3iLUjpojd8CGlR/PDt4K83L0T2miDnieDsiVHv0dN0RtfRVRMtP0yjHdP6C59oOA==", "dev": true, "license": "MIT", "engines": { @@ -4208,9 +4208,9 @@ } }, "node_modules/vite": { - "version": "7.1.12", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz", - "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-7.2.2.tgz", + "integrity": "sha512-BxAKBWmIbrDgrokdGZH1IgkIk/5mMHDreLDmCJ0qpyJaAteP8NvMhkwr/ZCQNqNH97bw/dANTE9PDzqwJghfMQ==", "dev": true, "license": "MIT", "dependencies": { diff --git a/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package.json b/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package.json index 8469797..2c4814e 100644 --- a/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package.json +++ b/src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package.json @@ -12,9 +12,9 @@ "lit": "^3.3.1" }, "devDependencies": { - "@umbraco-cms/backoffice": "^16.3.1", + "@umbraco-cms/backoffice": "^16.3.3", "typescript": "^5.9.3", - "vite": "^7.1.12" + "vite": "^7.2.2" }, "volta": { "node": "22.12.0"