From 2f7361655283f4d83a80da8d653da6fd91137754 Mon Sep 17 00:00:00 2001 From: Jack Cherng Date: Sat, 2 Mar 2024 16:37:41 +0800 Subject: [PATCH] chore: simplify CI Signed-off-by: Jack Cherng --- .github/workflows/docs.yml | 10 ++++------ .github/workflows/python.yml | 4 ++-- Makefile | 4 +++- docs/Makefile | 6 ++++-- docs/requirements.txt | 2 +- docs/src/changelog.md | 4 ++++ 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9ed2c41a..e5a49c93 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -17,9 +17,8 @@ jobs: python-version: 3.x - run: python -m pip install -U uv - run: | - cd docs/ - uv v && . .venv/bin/activate - make install build + make -C docs/ UV_INSTALL_FLAGS="--system" \ + install build job_deploy: # deploy only on the "stable" branch if: ${{ github.ref == 'refs/heads/stable' }} @@ -32,6 +31,5 @@ jobs: python-version: 3.x - run: python -m pip install -U uv - run: | - cd docs/ - uv v && . .venv/bin/activate - make install deploy + make -C docs/ UV_INSTALL_FLAGS="--system" \ + install deploy diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 8872f729..c8a049f3 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -47,5 +47,5 @@ jobs: - name: Do linting run: | - uv v && . .venv/bin/activate - make install ci-check + make UV_INSTALL_FLAGS="--system" \ + install ci-check diff --git a/Makefile b/Makefile index 6f572ed5..2aca9290 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,11 @@ +UV_INSTALL_FLAGS := + .PHONY: all all: .PHONY: install install: - uv pip install -r requirements.txt + uv pip install $(UV_INSTALL_FLAGS) -r requirements.txt .PHONY: pip-compile pip-compile: diff --git a/docs/Makefile b/docs/Makefile index 45dc53b4..85b3cb44 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,9 +1,11 @@ +UV_INSTALL_FLAGS := + .phony: all all: build .PHONY: install -install: pip-compile - uv pip install -r requirements.txt +install: + uv pip install $(UV_INSTALL_FLAGS) -r requirements.txt .PHONY: pip-compile pip-compile: diff --git a/docs/requirements.txt b/docs/requirements.txt index 6a757851..9957d053 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -68,7 +68,7 @@ pygments==2.17.2 # via mkdocs-material pymdown-extensions==10.7 # via mkdocs-material -python-dateutil==2.9.0 +python-dateutil==2.9.0.post0 # via ghp-import pytz==2024.1 # via mkdocs-git-revision-date-localized-plugin diff --git a/docs/src/changelog.md b/docs/src/changelog.md index 644e21d9..e942d679 100644 --- a/docs/src/changelog.md +++ b/docs/src/changelog.md @@ -1 +1,5 @@ +--- +title: Changelog +--- + --8<-- "../../../CHANGELOG.md"