Skip to content

Commit a8cd92e

Browse files
authored
Merge pull request #21 from jcdcdev/dev/v14
14.0.2
2 parents 02d2e6b + bf90480 commit a8cd92e

File tree

8 files changed

+62
-77
lines changed

8 files changed

+62
-77
lines changed

.github/dependabot.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/auto-assign.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: 🤖 Auto Assign
2+
on:
3+
issues:
4+
types: [opened, edited, labeled, unlabeled]
5+
pull_request:
6+
types: [opened, edited, labeled, unlabeled]
7+
jobs:
8+
run:
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: wow-actions/auto-assign@v3
12+
with:
13+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
14+
reviewers: |
15+
${{ github.repository_owner }}
16+
assignees: |
17+
${{ github.repository_owner }}

.github/workflows/build.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
name: 🏗️ Build
22
on:
33
pull_request:
4-
branches: "*"
54
workflow_dispatch:
65
jobs:
7-
metadata:
8-
uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@dev
96
build:
107
runs-on: ubuntu-latest
11-
needs:
12-
- metadata
138
steps:
149
- name: Build
1510
uses: jcdcdev/jcdcdev.Umbraco.Github.Build@main
1611
with:
17-
project-name: ${{ needs.metadata.outputs.project-name}}
18-
project-path: ${{ needs.metadata.outputs.project-path }}
19-
npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }}
12+
project-name: jcdcdev.Umbraco.ExtendedMarkdownEditor
13+
project-path: src/jcdcdev.Umbraco.ExtendedMarkdownEditor/jcdcdev.Umbraco.ExtendedMarkdownEditor.csproj
14+
npm-working-dir: src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client
2015
npm-enabled: true
2116
umbraco-version: 14
Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
name: 🔃 Create PRs
1+
name: 📤 Create PRs
22
on:
33
workflow_dispatch:
44
inputs:
55
dry-run:
6-
description: 'Run the workflow without creating PRs'
6+
description: "Dry run: Run the workflow without creating a Pull Request"
77
required: false
88
default: false
99
type: boolean
1010
schedule:
11-
- cron: '0 0 * * *'
11+
- cron: '0 2 * * *'
1212
jobs:
1313
get-branches:
1414
outputs:
@@ -36,12 +36,10 @@ jobs:
3636
matrix:
3737
branch: ${{fromJson(needs.get-branches.outputs.branches)}}
3838
runs-on: ubuntu-latest
39+
env:
40+
DRY_RUN: ${{ contains(github.event.inputs.dry-run, 'true') }}
3941
steps:
40-
- name: Checkout code
41-
uses: actions/checkout@v4
42-
with:
43-
fetch-depth: 0
44-
- name: Set Env
42+
- name: Set Variables
4543
run: |
4644
TARGET=$(echo ${{ matrix.branch }} | sed 's/dev\///')
4745
SOURCE=${{ matrix.branch }}
@@ -56,22 +54,16 @@ jobs:
5654
exit 1
5755
fi
5856
59-
if [ "$SOURCE" == "$TARGET" ]; then
60-
echo "SOURCE is the same as TARGET"
61-
exit 1
62-
fi
63-
6457
echo "SOURCE=$SOURCE"
6558
echo "TARGET=$TARGET"
59+
6660
echo "SOURCE=$SOURCE" >> $GITHUB_ENV
6761
echo "TARGET=$TARGET" >> $GITHUB_ENV
68-
- name: Run the Action
69-
if: ${{ github.event.inputs.dry-run == 'false' }}
70-
uses: devops-infra/[email protected]
62+
- name: Create Pull Request
63+
id: create-pull-request
64+
uses: jcdcdev/jcdcdev.GitHub.CreatePullRequest@main
7165
with:
72-
github_token: ${{ secrets.GITHUB_TOKEN }}
73-
source_branch: ${{ env.SOURCE }}
74-
target_branch: ${{ env.TARGET }}
75-
title: "Merge ${{ env.SOURCE }} into ${{ env.TARGET }}"
76-
reviewer: ${{ github.repository_owner }}
77-
assignee: ${{ github.repository_owner }}
66+
source-branch: ${{ env.SOURCE }}
67+
target-branch: ${{ env.TARGET }}
68+
dry-run: ${{ env.DRY_RUN }}
69+
github-token: ${{ secrets.JCDC_BOT_TOKEN }}

.github/workflows/release.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,20 @@ on:
33
workflow_dispatch:
44
pull_request:
55
types: [ closed ]
6-
jobs:
7-
metadata:
8-
uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@dev
6+
jobs:
97
release:
8+
if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
109
runs-on: ubuntu-latest
1110
permissions:
1211
contents: write
13-
needs:
14-
- metadata
1512
steps:
1613
- name: Build
1714
id: build
1815
uses: jcdcdev/jcdcdev.Umbraco.GitHub.Build@main
1916
with:
20-
project-name: ${{ needs.metadata.outputs.project-name}}
21-
project-path: ${{ needs.metadata.outputs.project-path }}
22-
npm-working-dir: ${{ needs.metadata.outputs.npm-working-dir }}
17+
project-name: jcdcdev.Umbraco.ExtendedMarkdownEditor
18+
project-path: src/jcdcdev.Umbraco.ExtendedMarkdownEditor/jcdcdev.Umbraco.ExtendedMarkdownEditor.csproj
19+
npm-working-dir: src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client
2320
npm-enabled: true
2421
umbraco-version: 14
2522
- name: Release

src/TestSite.14/TestSite.14.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="14.0.0-rc4"/>
10+
<PackageReference Include="Umbraco.Cms" Version="14.2.0"/>
1111
<PackageReference Include="uSync" Version="14.0.0-rc4"/>
1212
</ItemGroup>
1313

src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package-lock.json

Lines changed: 21 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/jcdcdev.Umbraco.ExtendedMarkdownEditor.Client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"preview": "vite preview"
1010
},
1111
"dependencies": {
12-
"lit": "^3.1.4"
12+
"lit": "^3.2.0"
1313
},
1414
"devDependencies": {
1515
"@umbraco-cms/backoffice": "^14.0.0",

0 commit comments

Comments
 (0)