From 0a06a84c3a24dca8d2ad2a7ec2bc03f512a40dd9 Mon Sep 17 00:00:00 2001 From: Brian Munkholm Date: Fri, 9 May 2025 13:00:27 +0200 Subject: [PATCH 1/5] CI: Remove building docs on macOS --- .github/workflows/docs.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 1a3dabc..9ef88dc 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -11,12 +11,8 @@ concurrency: jobs: documentation: - name: Build docs on ${{ matrix.os }} - runs-on: ${{ matrix.os }} - - strategy: - matrix: - os: [ubuntu-latest, macos-latest] + name: Build docs on ubuntu-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From cf9f5ea6c1042e098f663e94b3a812b4303056a5 Mon Sep 17 00:00:00 2001 From: Brian Munkholm Date: Fri, 9 May 2025 13:09:09 +0200 Subject: [PATCH 2/5] Update docs.yml --- .github/workflows/docs.yml | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 9ef88dc..b95e54a 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -4,7 +4,11 @@ on: push: branches: - main - + + # Allow job to be triggered manually. + workflow_dispatch: + +# Cancel in-progress jobs when pushing to the same branch. concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true @@ -15,11 +19,17 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: Acquire sources + uses: actions/checkout@v4 + - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: 3.11 + python-version: "3.11" + cache: 'pip' + cache-dependency-path: | + docs/requirements.txt + - name: Build docs run: | cd docs && make check From d7888b5dd3b0d3f305df080b15a3d929ab5b9762 Mon Sep 17 00:00:00 2001 From: Brian Munkholm Date: Fri, 9 May 2025 13:36:47 +0200 Subject: [PATCH 3/5] Update subscribe-azure.rst --- docs/tutorials/deploy/marketplace/subscribe-azure.rst | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docs/tutorials/deploy/marketplace/subscribe-azure.rst b/docs/tutorials/deploy/marketplace/subscribe-azure.rst index d9732f5..9daf785 100644 --- a/docs/tutorials/deploy/marketplace/subscribe-azure.rst +++ b/docs/tutorials/deploy/marketplace/subscribe-azure.rst @@ -12,9 +12,7 @@ Crate.io. As a SaaS service, the subscription payment is arranged through Azure. The cluster will be hosted in the region you select as part of the configuration -process. If you are looking for a self-hosted CrateDB Cloud service, check out -the :ref:`CrateDB Cloud on Kubernetes tutorial `. To pay -directly for a hosted cluster by credit card, see the tutorial for +process. To pay directly for a hosted cluster by credit card, see the tutorial for :ref:`direct cluster deployment `. @@ -75,4 +73,4 @@ billing in the CrateDB Cloud console. .. _Azure documentation on resource groups: https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/manage-resource-groups-portal .. _Azure documentation on tags: https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources -.. _Azure Marketplace: https://azuremarketplace.microsoft.com/en-us/marketplace/apps/crate.cratedbcloud?tab=Overview \ No newline at end of file +.. _Azure Marketplace: https://azuremarketplace.microsoft.com/en-us/marketplace/apps/crate.cratedbcloud?tab=Overview From 91d6a5a45861ac3a0414dca698c05cca4e157929 Mon Sep 17 00:00:00 2001 From: Brian Munkholm Date: Fri, 9 May 2025 13:45:30 +0200 Subject: [PATCH 4/5] Revert "Update subscribe-azure.rst" This reverts commit d7888b5dd3b0d3f305df080b15a3d929ab5b9762. --- docs/tutorials/deploy/marketplace/subscribe-azure.rst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/tutorials/deploy/marketplace/subscribe-azure.rst b/docs/tutorials/deploy/marketplace/subscribe-azure.rst index 9daf785..d9732f5 100644 --- a/docs/tutorials/deploy/marketplace/subscribe-azure.rst +++ b/docs/tutorials/deploy/marketplace/subscribe-azure.rst @@ -12,7 +12,9 @@ Crate.io. As a SaaS service, the subscription payment is arranged through Azure. The cluster will be hosted in the region you select as part of the configuration -process. To pay directly for a hosted cluster by credit card, see the tutorial for +process. If you are looking for a self-hosted CrateDB Cloud service, check out +the :ref:`CrateDB Cloud on Kubernetes tutorial `. To pay +directly for a hosted cluster by credit card, see the tutorial for :ref:`direct cluster deployment `. @@ -73,4 +75,4 @@ billing in the CrateDB Cloud console. .. _Azure documentation on resource groups: https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/manage-resource-groups-portal .. _Azure documentation on tags: https://docs.microsoft.com/en-us/azure/azure-resource-manager/management/tag-resources -.. _Azure Marketplace: https://azuremarketplace.microsoft.com/en-us/marketplace/apps/crate.cratedbcloud?tab=Overview +.. _Azure Marketplace: https://azuremarketplace.microsoft.com/en-us/marketplace/apps/crate.cratedbcloud?tab=Overview \ No newline at end of file From 07c6f46fc0d82302de637154268f0a83dee18abf Mon Sep 17 00:00:00 2001 From: Brian Munkholm Date: Fri, 9 May 2025 14:41:34 +0200 Subject: [PATCH 5/5] Update docs.yml --- .github/workflows/docs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b95e54a..feec5f4 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -25,7 +25,7 @@ jobs: - name: Set up Python uses: actions/setup-python@v5 with: - python-version: "3.11" + python-version: "3.13" cache: 'pip' cache-dependency-path: | docs/requirements.txt