Skip to content

Commit

Permalink
Merge pull request #40 from jcdcdev/dev/v14
Browse files Browse the repository at this point in the history
14.1.1
  • Loading branch information
jcdcdev authored Sep 29, 2024
2 parents 206d532 + a31184e commit 031265b
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 84 deletions.
25 changes: 0 additions & 25 deletions .github/dependabot.yml

This file was deleted.

17 changes: 17 additions & 0 deletions .github/workflows/auto-assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: 🤖 Auto Assign
on:
issues:
types: [opened, edited, labeled, unlabeled]
pull_request:
types: [opened, edited, labeled, unlabeled]
jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: wow-actions/auto-assign@v3
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
reviewers: |
${{ github.repository_owner }}
assignees: |
${{ github.repository_owner }}
11 changes: 3 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
name: 🏗️ Build
on:
pull_request:
branches: "*"
workflow_dispatch:
jobs:
metadata:
uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main
build:
runs-on: ubuntu-latest
needs:
- metadata
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 }}
project-name: Umbraco.Community.BackOfficeOrganiser
project-path: src/Umbraco.Community.BackOfficeOrganiser/Umbraco.Community.BackOfficeOrganiser.csproj
npm-working-dir: src/Umbraco.Community.BackOfficeOrganiser.Client
npm-enabled: true
umbraco-version: 14
36 changes: 14 additions & 22 deletions .github/workflows/pr.yml → .github/workflows/create-pr.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: 🔃 Create PRs
name: 📤 Create PRs
on:
workflow_dispatch:
inputs:
dry-run:
description: 'Run the workflow without creating PRs'
description: "Dry run: Run the workflow without creating a Pull Request"
required: false
default: false
type: boolean
schedule:
- cron: '0 0 * * *'
- cron: '0 2 * * *'
jobs:
get-branches:
outputs:
Expand Down Expand Up @@ -36,12 +36,10 @@ jobs:
matrix:
branch: ${{fromJson(needs.get-branches.outputs.branches)}}
runs-on: ubuntu-latest
env:
DRY_RUN: ${{ contains(github.event.inputs.dry-run, 'true') }}
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set Env
- name: Set Variables
run: |
TARGET=$(echo ${{ matrix.branch }} | sed 's/dev\///')
SOURCE=${{ matrix.branch }}
Expand All @@ -56,22 +54,16 @@ jobs:
exit 1
fi
if [ "$SOURCE" == "$TARGET" ]; then
echo "SOURCE is the same as TARGET"
exit 1
fi
echo "SOURCE=$SOURCE"
echo "TARGET=$TARGET"
echo "SOURCE=$SOURCE" >> $GITHUB_ENV
echo "TARGET=$TARGET" >> $GITHUB_ENV
- name: Run the Action
if: ${{ github.event.inputs.dry-run == 'false' }}
uses: devops-infra/[email protected]
- name: Create Pull Request
id: create-pull-request
uses: jcdcdev/jcdcdev.GitHub.CreatePullRequest@main
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ${{ env.SOURCE }}
target_branch: ${{ env.TARGET }}
title: "Merge ${{ env.SOURCE }} into ${{ env.TARGET }}"
reviewer: ${{ github.repository_owner }}
assignee: ${{ github.repository_owner }}
source-branch: ${{ env.SOURCE }}
target-branch: ${{ env.TARGET }}
dry-run: ${{ env.DRY_RUN }}
github-token: ${{ secrets.JCDC_BOT_TOKEN }}
11 changes: 4 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,19 @@ on:
pull_request:
types: [ closed ]
jobs:
metadata:
uses: jcdcdev/jcdcdev.Github.UmbracoSimpleDeploy/.github/workflows/generate-project-metadata.yml@main
release:
if: github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest
permissions:
contents: write
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 }}
project-name: Umbraco.Community.BackOfficeOrganiser
project-path: src/Umbraco.Community.BackOfficeOrganiser/Umbraco.Community.BackOfficeOrganiser.csproj
npm-working-dir: src/Umbraco.Community.BackOfficeOrganiser.Client
npm-enabled: true
umbraco-version: 14
- name: Release
Expand Down
45 changes: 25 additions & 20 deletions src/Umbraco.Community.BackOfficeOrganiser.Client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Umbraco.Community.BackOfficeOrganiser.Client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
"generate": "openapi-ts"
},
"dependencies": {
"lit": "^3.1.3"
"lit": "^3.2.0"
},
"devDependencies": {
"@hey-api/openapi-ts": "^0.46.3",
"@umbraco-cms/backoffice": "^14.0.0",
"typescript": "^5.0.2",
"vite": "^4.5.3"
"vite": "^4.5.5"
},
"volta": {
"node": "21.7.3"
Expand Down

0 comments on commit 031265b

Please sign in to comment.