diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 9175d62..df770af 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -7,7 +7,6 @@ on: push: branches: - main - - 'release/**' paths: - 'docs/**' - 'mkdocs.yml' @@ -16,9 +15,6 @@ on: - 'SECURITY.md' - 'noxfile.py' - '.github/workflows/deploy-docs.yml' - # Trigger on tags regardless of paths changed - tags: - - 'v*' pull_request: branches: - main @@ -77,17 +73,22 @@ jobs: cd docs/assets/brand zip -r ../brand-kit.zip . + - name: Set docs version for topbar + run: | + VERSION=$(python3 -c "import tomllib; print('v' + tomllib.load(open('pyproject.toml','rb'))['project']['version'])") + echo "DOCS_VERSION=${VERSION}" >> "$GITHUB_ENV" + - name: Build Documentation run: uv run mkdocs build --strict - name: Deploy to Cloudflare Pages - # Allow deploy on push to main, workflow_dispatch, or version tags + # Production docs deploy only from main (or manual dispatch on main) if: | (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && - (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) + github.ref == 'refs/heads/main' uses: cloudflare/wrangler-action@v3 with: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - # Use 'main' as the production branch for Cloudflare regardless of tag name + # Deploy production docs from the merged main branch only. command: pages deploy site --project-name=zenzic --branch=main --commit-dirty=true diff --git a/mkdocs.yml b/mkdocs.yml index f6f4f1b..c0faf92 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -142,7 +142,7 @@ extra_css: extra: build_date: !ENV [BUILD_DATE, "dev"] generator: false - version: "0.4.0rc5" + version: !ENV [DOCS_VERSION, "dev"] social: - icon: fontawesome/brands/github link: https://github.com/PythonWoods/zenzic diff --git a/pyproject.toml b/pyproject.toml index 4377bae..82c7b24 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -167,7 +167,7 @@ exclude_lines = [ # ─── Version bumping ─────────────────────────────────────────────────────────── [tool.bumpversion] -current_version = "0.4.0rc4" +current_version = "0.5.0a1" commit = true tag = true tag_name = "v{new_version}"