Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,52 @@
version: 2

multi-ecosystem-groups:
infrastructure:
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 25
commit-message:
prefix: "chore"
include: "scope"

updates:
- package-ecosystem: "nuget"
directory: "/"
schedule:
interval: "weekly"
day: "wednesday"
open-pull-requests-limit: 25
cooldown:
default-days: 7
commit-message:
prefix: "chore"
include: "scope"
groups:
dotnet:
dotnet-minor-patch:
update-types:
- "minor"
- "patch"
patterns:
- "*"
- "*"
dotnet-major:
update-types:
- "major"
patterns:
- "*"

- package-ecosystem: "github-actions"
directory: "/"
patterns:
- "*"
multi-ecosystem-group: "infrastructure"
cooldown:
default-days: 7

- package-ecosystem: "uv"
directory: "/"
patterns:
- "*"
multi-ecosystem-group: "infrastructure"
cooldown:
default-days: 7
34 changes: 34 additions & 0 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Dependabot auto-merge

on:
pull_request_target:
types: [opened, synchronize, reopened]

permissions:
contents: write
pull-requests: write

jobs:
dependabot:
runs-on: ubuntu-latest
if: github.event.pull_request.user.login == 'dependabot[bot]' && github.repository == 'LayeredCraft/decoweaver'
steps:
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Approve PR
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
run: gh pr review --approve "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Enable auto-merge for Dependabot PRs
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22 changes: 10 additions & 12 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,16 @@ on:
paths:
- 'docs/**'
- 'mkdocs.yml'
- 'pyproject.toml'
- 'uv.lock'
- '.github/workflows/docs.yml'
pull_request:
branches: [ main ]
paths:
- 'docs/**'
- 'mkdocs.yml'
- 'pyproject.toml'
- 'uv.lock'
- '.github/workflows/docs.yml'

permissions:
Expand All @@ -35,28 +39,22 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v5
with:
python-version: '3.x'
python-version-file: pyproject.toml

- name: Cache dependencies
uses: actions/cache@v4
- name: Install uv
uses: astral-sh/setup-uv@v7
with:
key: mkdocs-material-${{ hashFiles('requirements.txt') }}
path: ~/.cache/pip
restore-keys: |
mkdocs-material-
enable-cache: true

- name: Install dependencies
run: |
pip install mkdocs-material
pip install mkdocs-minify-plugin
run: uv sync --locked

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Update contributor docs for the uv migration

Because this change removes requirements.txt and makes the CI path install docs dependencies with uv, the local documentation instructions are now stale: docs/contributing.md:296 still tells contributors to run pip install -r requirements.txt, which fails on a fresh checkout because that file no longer exists. Please update the contributor instructions to use the new uv sync / uv run mkdocs ... flow, or keep a requirements file for the documented command.

Useful? React with 👍 / 👎.


- name: Setup Pages
id: pages
uses: actions/configure-pages@v4

- name: Build documentation
run: |
mkdocs build --clean
run: uv run mkdocs build --clean

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
Expand Down
4 changes: 3 additions & 1 deletion LayeredCraft.DecoWeaver.slnx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Solution>
<Folder Name="/docs/">
<File Path="requirements.txt" />
<File Path="pyproject.toml" />
<File Path="uv.lock" />
<File Path="mkdocs.yml" />
<File Path="docs\index.md" />
<File Path="docs\changelog.md" />
Expand Down Expand Up @@ -56,6 +57,7 @@
<File Path=".gitignore" />
<File Path=".gitattributes" />
<File Path=".github\dependabot.yml" />
<File Path=".github\workflows\dependabot-auto-merge.yml" />
<File Path=".github\workflows\pr-build.yaml" />
<File Path=".github\workflows\docs.yml" />
</Folder>
Expand Down
10 changes: 10 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[project]
name = "decoweaver-docs"
version = "0.0.0"
description = "Documentation build dependencies for DecoWeaver."
requires-python = ">=3.12"
dependencies = [
"mkdocs>=1.5.3",
"mkdocs-material>=9.4.6",
"mkdocs-minify-plugin>=0.7.1",
]
3 changes: 0 additions & 3 deletions requirements.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -48,22 +48,22 @@
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<PackageReference Include="Basic.Reference.Assemblies.Net80" Version="1.8.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.1, 9.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
<PackageReference Include="Basic.Reference.Assemblies.Net90" Version="1.8.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.17" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[9.0.17, 10.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net10.0'">
<PackageReference Include="Basic.Reference.Assemblies.Net100" Version="1.8.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[10.0.9, 11.0.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net11.0'">
<PackageReference Include="Basic.Reference.Assemblies.Net110" Version="1.8.9" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="11.0.0-preview.5.26302.115" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[11.0.0-preview.5.26302.115, 12.0.0-a)" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading