From 118e3131468d62098d6f8ec7d454d1f31bbc8c1e Mon Sep 17 00:00:00 2001 From: David Garcia Date: Tue, 7 May 2024 14:41:41 +0100 Subject: [PATCH 1/2] docs: update theme 1.7 --- .github/workflows/docs-amplify-enhanced.yaml | 17 ---------- .github/workflows/docs-links.yaml | 34 -------------------- .github/workflows/docs-pages.yaml | 7 ++-- .github/workflows/docs-pr.yaml | 6 ++-- .lycheeignore | 5 --- amplify.yml | 15 --------- docs/pyproject.toml | 2 +- 7 files changed, 8 insertions(+), 78 deletions(-) delete mode 100644 .github/workflows/docs-amplify-enhanced.yaml delete mode 100644 .github/workflows/docs-links.yaml delete mode 100644 .lycheeignore delete mode 100644 amplify.yml diff --git a/.github/workflows/docs-amplify-enhanced.yaml b/.github/workflows/docs-amplify-enhanced.yaml deleted file mode 100644 index 702dd0e4..00000000 --- a/.github/workflows/docs-amplify-enhanced.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: "Docs / Amplify enhanced" - -on: issue_comment - -jobs: - build: - runs-on: ubuntu-latest - if: ${{ github.event.issue.pull_request }} - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Amplify enhanced - env: - TOKEN: ${{ secrets.GITHUB_TOKEN }} - uses: scylladb/sphinx-scylladb-theme/.github/actions/amplify-enhanced@master diff --git a/.github/workflows/docs-links.yaml b/.github/workflows/docs-links.yaml deleted file mode 100644 index 506c9441..00000000 --- a/.github/workflows/docs-links.yaml +++ /dev/null @@ -1,34 +0,0 @@ -name: "Docs / Links" -# For more information, -# see https://sphinx-theme.scylladb.com/stable/deployment/production.html#available-workflows - -on: - workflow_dispatch: - schedule: - - cron: "0 0 * * 0" # At 00:00 on Sunday - -jobs: - linkChecker: - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - persist-credentials: false - fetch-depth: 0 - - - name: Link Checker - id: lychee - uses: lycheeverse/lychee-action@v1.3.2 - with: - args: --verbose --no-progress './**/*.md' './**/*.rst' - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - - name: Create Issue From File - if: ${{ steps.lychee.outputs.exit_code != 0 }} - uses: peter-evans/create-issue-from-file@v3 - with: - title: Link Checker Report - content-filepath: ./lychee/out.md - labels: report, automated issue diff --git a/.github/workflows/docs-pages.yaml b/.github/workflows/docs-pages.yaml index 73e6ffc5..cf89ec08 100644 --- a/.github/workflows/docs-pages.yaml +++ b/.github/workflows/docs-pages.yaml @@ -6,6 +6,7 @@ on: push: branches: - master + - 'branch-**' paths: - "docs/**" workflow_dispatch: @@ -15,14 +16,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false fetch-depth: 0 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: - python-version: 3.7 + python-version: '3.10' - name: Set up env run: make -C docs setupenv - name: Build docs diff --git a/.github/workflows/docs-pr.yaml b/.github/workflows/docs-pr.yaml index 9d3af136..fd65f362 100644 --- a/.github/workflows/docs-pr.yaml +++ b/.github/workflows/docs-pr.yaml @@ -14,14 +14,14 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: persist-credentials: false fetch-depth: 0 - name: Set up Python - uses: actions/setup-python@v3 + uses: actions/setup-python@v5 with: - python-version: 3.7 + python-version: '3.10' - name: Set up env run: make -C docs setupenv - name: Build docs diff --git a/.lycheeignore b/.lycheeignore deleted file mode 100644 index 7e0958d9..00000000 --- a/.lycheeignore +++ /dev/null @@ -1,5 +0,0 @@ -http://127.0.0.1 -http://127.0.0.1 -http://localhost -java/README.md -http://maven.apache.org/POM/4.0.0 diff --git a/amplify.yml b/amplify.yml deleted file mode 100644 index a5b974f5..00000000 --- a/amplify.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: 1 -applications: - - frontend: - phases: - build: - commands: - - make setupenv - - make dirhtml - artifacts: - baseDirectory: _build/dirhtml - files: - - '**/*' - cache: - paths: [] - appRoot: docs diff --git a/docs/pyproject.toml b/docs/pyproject.toml index f5c6928c..36602c5f 100644 --- a/docs/pyproject.toml +++ b/docs/pyproject.toml @@ -9,7 +9,7 @@ python = "^3.9" pyyaml = "6.0.1" pygments = "2.15.1" redirects_cli ="~0.1.2" -sphinx-scylladb-theme = "~1.6.1" +sphinx-scylladb-theme = "~1.7.2" sphinx-sitemap = "2.5.1" sphinx-autobuild = "2021.3.14" Sphinx = "7.2.6" From 4bedf48c37604fc8225525984f1f378550442d48 Mon Sep 17 00:00:00 2001 From: David Garcia Date: Tue, 7 May 2024 15:15:36 +0100 Subject: [PATCH 2/2] docs: update theme 1.7 --- .github/workflows/docs-pages.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docs-pages.yaml b/.github/workflows/docs-pages.yaml index cf89ec08..6397cd54 100644 --- a/.github/workflows/docs-pages.yaml +++ b/.github/workflows/docs-pages.yaml @@ -18,6 +18,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 with: + ref: ${{ github.event.repository.default_branch }} persist-credentials: false fetch-depth: 0 - name: Set up Python