Merge pull request #8 from jcdcdev/dev/v14

Dev/v14

Author: jcdcdev

.github/workflows/build.yml

@@ -5,11 +5,17 @@ on:
   workflow_dispatch:
 jobs:
   metadata:
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main
+    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@dev
   build:
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main
+    runs-on: ubuntu-latest
     needs:
       - metadata
-    with:
-      project-name: ${{ needs.metadata.outputs.project-name }}
-      project-path: ${{ needs.metadata.outputs.project-path }}
+    steps:
+      - name: Build
+        uses: jcdcdev/jcdcdev.Umbraco.Github.Build@main
+        with:
+          project-name: ${{ needs.metadata.outputs.project-name}}
+          project-path: ${{ needs.metadata.outputs.project-path }}
+          npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }}
+          npm-enabled: true
+          umbraco-version: 14

.github/workflows/release.yml

@@ -1,24 +1,31 @@
 name: 🚀 Release
 on:
   workflow_dispatch:
+  pull_request:
+    types: [ closed ]
 jobs:
   metadata:
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main
-  build:
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/build-template.yml@main
-    needs:
-      - metadata
-    with:
-      project-name: ${{ needs.metadata.outputs.project-name }}
-      project-path: ${{ needs.metadata.outputs.project-path }}
+    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@dev
   release:
-    needs:
-      - build
+    runs-on: ubuntu-latest
     permissions:
       contents: write
-    uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/release-template.yml@main
-    with:
-      artifact-name: ${{ needs.build.outputs.artifact-name }}
-      version: ${{ needs.build.outputs.version }}
-    secrets:
-      nuget-api-key: ${{ secrets.NUGET_API_KEY }}
+    needs:
+      - metadata
+    steps:
+      - name: Build
+        id: build
+        uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@main
+        with:
+          project-name: ${{ needs.metadata.outputs.project-name}}
+          project-path: ${{ needs.metadata.outputs.project-path }}
+          npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }}
+          npm-enabled: true
+          umbraco-version: 14
+      - name: Release
+        uses: jcdcdev/jcdcdev.Umbraco.GitHub.Release@main
+        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 }}

.gitignore

@@ -357,3 +357,4 @@ src/.idea
 *.sqlite.db*
 .idea/
 /src/TestSite.*/umbraco/Data/TEMP/
+/src/jcdcdev.Umbraco.ExtendedMarkdownEditor/wwwroot/App_Plugins/jcdcdev.Umbraco.ExtendedMarkdownEditor/dist/