Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

feat: enhance auto-merge workflow for Dependabot PRs

Andrej Acevskia321a4bdc266
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index e3b38c2ea..4d2d0063f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
blank_issues_enabled: false
contact_links:
- name: Kaneo Documentation
- url: https://kaneo.app/docs
+ url: https://kaneo.app/docs/core
about: Check our documentation for answers to common questions
- name: Kaneo Discord Community
url: https://discord.gg/rU4tSyhXXU
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index ab8773b84..97bdef5cb 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -19,9 +19,23 @@ jobs:
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- - name: Enable Auto-Merge
+ - name: Auto-Merge Dependabot PR
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
- run: gh pr merge --auto --rebase "$PR_URL"
+ run: |
+ # Wait a bit for any checks to start
+ sleep 30
+
+ # Check if all required checks have passed
+ if gh pr view "$PR_URL" --json statusCheckRollup --jq '.statusCheckRollup | all(.conclusion == "SUCCESS")'; then
+ echo "All checks passed, merging..."
+ gh pr merge --rebase "$PR_URL"
+ elif gh pr view "$PR_URL" --json statusCheckRollup --jq '.statusCheckRollup | length == 0'; then
+ echo "No status checks required, merging..."
+ gh pr merge --rebase "$PR_URL"
+ else
+ echo "Status checks not passed, skipping merge"
+ gh pr view "$PR_URL" --json statusCheckRollup
+ fi
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
\ No newline at end of file
diff --git a/apps/docs/app/(home)/layout.tsx b/apps/docs/app/(home)/layout.tsx
index 923b36fe9..6e19c424b 100644
--- a/apps/docs/app/(home)/layout.tsx
+++ b/apps/docs/app/(home)/layout.tsx
@@ -104,7 +104,7 @@ export default function Layout({ children }: { children: ReactNode }) {
},
{
text: "Documentation",
- url: "/docs",
+ url: "/docs/core",
},
{
text: "Sponsor",
diff --git a/apps/docs/app/sitemap.ts b/apps/docs/app/sitemap.ts
index 1fbde0271..34b464e11 100644
--- a/apps/docs/app/sitemap.ts
+++ b/apps/docs/app/sitemap.ts
@@ -13,7 +13,7 @@ export default function sitemap(): MetadataRoute.Sitemap {
priority: 1,
},
{
- url: `${baseUrl}/docs`,
+ url: `${baseUrl}/docs/core`,
lastModified: new Date(),
changeFrequency: "weekly" as const,
priority: 0.9,
diff --git a/apps/docs/components/footer.tsx b/apps/docs/components/footer.tsx
index 984670672..5bcd8b6de 100644
--- a/apps/docs/components/footer.tsx
+++ b/apps/docs/components/footer.tsx
@@ -61,7 +61,7 @@ export default function Footer() {
<div className="flex flex-wrap gap-4 sm:flex-col">
<Link
className="text-muted-foreground hover:text-primary block duration-150"
- href="/docs"
+ href="/docs/core"
>
<span>Documentation</span>
</Link>
diff --git a/apps/docs/content/docs/core/integrations/github/setup.mdx b/apps/docs/content/docs/core/integrations/github/setup.mdx
index 7331ad07f..23efbfee9 100644
--- a/apps/docs/content/docs/core/integrations/github/setup.mdx
+++ b/apps/docs/content/docs/core/integrations/github/setup.mdx
@@ -40,7 +40,7 @@ Fill in the basic app information:
- **GitHub App name**: `kaneo-[your-instance-name]` (must be unique across GitHub)
- **Description**: `Kaneo project management integration`
- **Homepage URL**: Your planned Kaneo instance URL (e.g., `https://kaneo.yourdomain.com`)
-- **Webhook URL**: `https://your-kaneo-instance.com/github-integration/webhook`
+- **Webhook URL**: `https://your-kaneo-instance.com/api/github-integration/webhook`
- **Webhook secret**: Generate a secure random string (save this for later)
<Callout type="warning">
diff --git a/apps/docs/next-env.d.ts b/apps/docs/next-env.d.ts
index c4b7818fb..9edff1c7c 100644
--- a/apps/docs/next-env.d.ts
+++ b/apps/docs/next-env.d.ts
@@ -1,6 +1,6 @@
/// <reference types="next" />
/// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
// NOTE: This file should not be edited
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.