diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index 9f715a1..0000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,25 +0,0 @@ -version: 2 -updates: - - package-ecosystem: nuget - assignees: - - "${{ github.repository_owner }}" - directory: "/" - schedule: - interval: "daily" - time: "04:00" - commit-message: - prefix: "chore" - include: "scope" - target-branch: "dev" - - - package-ecosystem: npm - assignees: - - "${{ github.repository_owner }}" - directory: "/" - schedule: - interval: "daily" - time: "04:00" - commit-message: - prefix: "chore" - include: "scope" - target-branch: "dev" diff --git a/.github/workflows/auto-assign.yml b/.github/workflows/auto-assign.yml new file mode 100644 index 0000000..76c91d6 --- /dev/null +++ b/.github/workflows/auto-assign.yml @@ -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 }} \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74c4c5f..32bb62e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/create-pr.yml similarity index 66% rename from .github/workflows/pr.yml rename to .github/workflows/create-pr.yml index ea9cbc1..431bd68 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/create-pr.yml @@ -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: @@ -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 }} @@ -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/action-pull-request@v0.5.5 + - 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 }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3bfe4dc..67d0116 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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 diff --git a/src/Umbraco.Community.BackOfficeOrganiser.Client/package-lock.json b/src/Umbraco.Community.BackOfficeOrganiser.Client/package-lock.json index 97ed3bf..3c5fdc8 100644 --- a/src/Umbraco.Community.BackOfficeOrganiser.Client/package-lock.json +++ b/src/Umbraco.Community.BackOfficeOrganiser.Client/package-lock.json @@ -8,13 +8,13 @@ "name": "backoffice-organiser", "version": "0.0.0", "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" } }, "node_modules/@apidevtools/json-schema-ref-parser": { @@ -78,14 +78,16 @@ "dev": true }, "node_modules/@lit-labs/ssr-dom-shim": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.0.tgz", - "integrity": "sha512-yWJKmpGE6lUURKAaIltoPIE/wrbY3TEkqQt+X0m+7fQNnAv0keydnYvbiJFP1PnMhizmIWRWOG5KLhYyc/xl+g==" + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.2.1.tgz", + "integrity": "sha512-wx4aBmgeGvFmOKucFKY+8VFJSYZxs9poN3SDNQFF6lT6NrQUnHiPB2PWz2sc4ieEcAaYYzN+1uWahEeTq2aRIQ==", + "license": "BSD-3-Clause" }, "node_modules/@lit/reactive-element": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-2.0.4.tgz", "integrity": "sha512-GFn91inaUa2oHLak8awSIigYz0cU0Payr1rcFsrkf5OJ5eSPxElyZfKh0f2p9FsTiZWXQdWGJeXZICEfXXYSXQ==", + "license": "BSD-3-Clause", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.2.0" } @@ -1636,29 +1638,32 @@ } }, "node_modules/lit": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.3.tgz", - "integrity": "sha512-l4slfspEsnCcHVRTvaP7YnkTZEZggNFywLEIhQaGhYDczG+tu/vlgm/KaWIEjIp+ZyV20r2JnZctMb8LeLCG7Q==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lit/-/lit-3.2.0.tgz", + "integrity": "sha512-s6tI33Lf6VpDu7u4YqsSX78D28bYQulM+VAzsGch4fx2H0eLZnJsUBsPWmGYSGoKDNbjtRv02rio1o+UdPVwvw==", + "license": "BSD-3-Clause", "dependencies": { "@lit/reactive-element": "^2.0.4", - "lit-element": "^4.0.4", - "lit-html": "^3.1.2" + "lit-element": "^4.1.0", + "lit-html": "^3.2.0" } }, "node_modules/lit-element": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.0.5.tgz", - "integrity": "sha512-iTWskWZEtn9SyEf4aBG6rKT8GABZMrTWop1+jopsEOgEcugcXJGKuX5bEbkq9qfzY+XB4MAgCaSPwnNpdsNQ3Q==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-4.1.0.tgz", + "integrity": "sha512-gSejRUQJuMQjV2Z59KAS/D4iElUhwKpIyJvZ9w+DIagIQjfJnhR20h2Q5ddpzXGS+fF0tMZ/xEYGMnKmaI/iww==", + "license": "BSD-3-Clause", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.2.0", "@lit/reactive-element": "^2.0.4", - "lit-html": "^3.1.2" + "lit-html": "^3.2.0" } }, "node_modules/lit-html": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.1.3.tgz", - "integrity": "sha512-FwIbqDD8O/8lM4vUZ4KvQZjPPNx7V1VhT7vmRB8RBAO0AU6wuTVdoXiu2CivVjEGdugvcbPNBLtPE1y0ifplHA==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-3.2.0.tgz", + "integrity": "sha512-pwT/HwoxqI9FggTrYVarkBKFN9MlTUpLrDHubTmW4SrkL3kkqW5gxwbxMMUnbbRHBC0WTZnYHcjDSCM559VyfA==", + "license": "BSD-3-Clause", "dependencies": { "@types/trusted-types": "^2.0.2" } @@ -2154,9 +2159,9 @@ } }, "node_modules/vite": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", - "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", + "version": "4.5.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.5.tgz", + "integrity": "sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==", "dev": true, "dependencies": { "esbuild": "^0.18.10", diff --git a/src/Umbraco.Community.BackOfficeOrganiser.Client/package.json b/src/Umbraco.Community.BackOfficeOrganiser.Client/package.json index 3530b2a..be97548 100644 --- a/src/Umbraco.Community.BackOfficeOrganiser.Client/package.json +++ b/src/Umbraco.Community.BackOfficeOrganiser.Client/package.json @@ -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"