You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by yz...@apache.org on 2026/07/06 13:36:05 UTC

(polaris) branch main updated: Moved site-guides.yml into ci.yml (#4971)

This is an automated email from the ASF dual-hosted git repository.

MonkeyCanCode pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git


The following commit(s) were added to refs/heads/main by this push:
     new 3dd26bc29d Moved site-guides.yml into ci.yml (#4971)
3dd26bc29d is described below

commit 3dd26bc29de734066e2054345ba9e6ca92167dd6
Author: Yong Zheng <yo...@gmail.com>
AuthorDate: Mon Jul 6 08:35:59 2026 -0500

    Moved site-guides.yml into ci.yml (#4971)
---
 .github/workflows/ci.yml          | 48 ++++++++++++++++++++++
 .github/workflows/site-guides.yml | 84 ---------------------------------------
 2 files changed, 48 insertions(+), 84 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bb32ea1636..5c7dbf5743 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -548,6 +548,53 @@ jobs:
       - name: Build Apache Site
         run: site/bin/create-static-site.sh
 
+  test-site-guides:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
+      - name: Set up JDK 21
+        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+      - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
+        with:
+          python-version: '3.14'
+      - name: Setup test environment
+        uses: ./.github/actions/setup-test-env
+
+      - name: Test site testing
+        working-directory: site/it
+        run: |
+          echo "::group::Setup"
+          python3 -m pip install --upgrade pip
+          python3 -m venv .venv
+          . .venv/bin/activate
+          UV_VERSION="$(cat pyproject.toml | grep -A1 tool.uv | grep -v tool.uv | grep required-version | sed 's/required-version *= *"\([^"]*\)".*/\1/')"
+          pip install "uv$UV_VERSION"
+          uv sync --all-packages
+          echo "::endgroup::"
+          echo "::group::pytest"
+          pytest
+          echo "::endgroup::"
+
+      - name: Free disk space
+        uses: ./.github/actions/free-disk-space
+      - name: Prepare Gradle build cache
+        uses: ./.github/actions/ci-incr-build-cache-prepare
+      - name: Guide testing
+        working-directory: site
+        run: it/markdown-testing.py
+      - name: Archive test results
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
+        if: always()
+        with:
+          name: upload-guides-test-artifacts
+          path: |
+            site/it/build/tests/**
+
   store-gradle-cache:
     name: Store Gradle Cache
     runs-on: ubuntu-24.04
@@ -590,6 +637,7 @@ jobs:
       - regtest
       - markdown-link-check
       - site
+      - test-site-guides
     # Always run this job, even if a "needed" job fails. Without this one, GitHub will not run
     # this job and that yields "Success" to the branch protection rule, which is wrong.
     # Potential results for each "needed" job are: `success`, `failure`, `cancelled`, `skipped`.
diff --git a/.github/workflows/site-guides.yml b/.github/workflows/site-guides.yml
deleted file mode 100644
index 96b5df6929..0000000000
--- a/.github/workflows/site-guides.yml
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-
-name: Site Guides
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - 'site/content/guides/**'
-      - 'site/it/**'
-  pull_request:
-    branches: [ "main" ]
-    paths:
-      - 'site/content/guides/**'
-  workflow_dispatch:
-    # Allow manual execution
-
-permissions:
-  contents: read
-
-jobs:
-  test-site-guides:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
-        with:
-          persist-credentials: false
-      - name: Set up JDK 21
-        uses: actions/setup-java@1bcf9fb12cf4aa7d266a90ae39939e61372fe520 # v5.4.0
-        with:
-          java-version: '21'
-          distribution: 'temurin'
-      - uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
-        with:
-          python-version: '3.14'
-      - name: Setup test environment
-        uses: ./.github/actions/setup-test-env
-
-      - name: Test site testing
-        working-directory: site/it
-        run: |
-          echo "::group::Setup"
-          python3 -m pip install --upgrade pip
-          python3 -m venv .venv
-          . .venv/bin/activate
-          UV_VERSION="$(cat pyproject.toml | grep -A1 tool.uv | grep -v tool.uv | grep required-version | sed 's/required-version *= *"\([^"]*\)".*/\1/')"
-          pip install "uv$UV_VERSION"
-          uv sync --all-packages
-          echo "::endgroup::"
-          echo "::group::pytest"
-          pytest
-          echo "::endgroup::"
-
-      - name: Free disk space
-        uses: ./.github/actions/free-disk-space
-      - name: Prepare Gradle build cache
-        uses: ./.github/actions/ci-incr-build-cache-prepare
-      - name: Guide testing
-        working-directory: site
-        run: it/markdown-testing.py
-      - name: Archive test results
-        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
-        if: always()
-        with:
-          name: upload-guides-test-artifacts
-          path: |
-            site/it/build/tests/**