(airflow-site) branch main updated: Do not rewrite ^docs/index.html on our website (#1224)

[potiuk]

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

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow-site.git


The following commit(s) were added to refs/heads/main by this push:
     new 18adef7ee2 Do not rewrite ^docs/index.html on our website (#1224)
18adef7ee2 is described below

commit 18adef7ee208ff7a58ca9c34cea2192241103663
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Tue Jul 22 13:41:46 2025 +0200

    Do not rewrite ^docs/index.html on our website (#1224)
    
    The docs/index.html is generated and published in the ASF infrastructure
    and we should not rewrite it and redirect to our S3 - this way whatever
    is the latest version on our "airflow-site" is the one published.
    
    So far, we copied the index over to S3 when we built documentation,
    but that step is not really needed any more if we do not rewrite the
    docs/index* URLS. This is more stable and "proper".
    
    We also do not have to optimize the artifacts any more - airflow-site
    does not produce huge website any more, so we do not have to
    delete the generated docs/index.html because there is no archive there
    any more.
---
 .github/workflows/build.yml         | 16 ----------------
 landing-pages/site/static/.htaccess |  2 ++
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ae4bba9b25..b4ca821abd 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,7 +27,6 @@ jobs:
   build:
     runs-on: ["ubuntu-22.04"]
     env:
-      S3_DOCS_BUCKET: ${{github.ref == 'refs/heads/staging' && 
'staging-docs-airflow-apache-org' || 'live-docs-airflow-apache-org'}}
       PROD_PUBLISH_REQUIRED: ${{ (github.event_name == 'push' || 
github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/main' || 
'false' }}
       STAGING_PUBLISH_REQUIRED: ${{ (github.event_name == 'push' || 
github.event_name == 'workflow_dispatch') && github.ref == 'refs/heads/staging' 
|| 'false' }}
       PUBLISH_BRANCH: ${{ github.ref == 'refs/heads/main' && 'publish' || 
'staging-publish' }}
@@ -35,7 +34,6 @@ jobs:
     steps:
       - name: ℹ️ Info
         run: |
-          echo "Using s3 bucket to copy index: ${S3_DOCS_BUCKET}"
           echo "PROD_PUBLISH_REQUIRED: ${PROD_PUBLISH_REQUIRED}"
           echo "STAGING_PUBLISH_REQUIRED: ${STAGING_PUBLISH_REQUIRED}"
       # Based on https://github.com/actions/runner-images/issues/2840
@@ -121,20 +119,6 @@ jobs:
           aws-access-key-id: ${{ secrets.DOCS_AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.DOCS_AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-2
-
-      - name: Copy docs index page to S3 docs
-        if: env.PROD_PUBLISH_REQUIRED != 'false' || 
env.STAGING_PUBLISH_REQUIRED != 'false'
-        run: |
-          aws s3 cp ./dist/docs/index.html 
s3://${S3_DOCS_BUCKET}/docs/index.html
-          aws s3 cp ./dist/docs/index.xml s3://${S3_DOCS_BUCKET}/docs/index.xml
-          aws cloudfront create-invalidation --distribution-id 
${CLOUDFRONT_DISTRIBUTION_ID} --paths "/docs/index.html"
-      - name: 🐅 Optimize artifacts
-        if: ${{ github.event_name == 'pull_request' }}
-        run: |
-          rm -rf ./dist/docs/*
-          echo "These files have been deleted to optimize the size of the 
artifacts." > ./dist/docs/index.html
-          echo "Here was the contents of the ./docs-archive directory" >> 
./dist/docs/index.html
-          find ./dist/
       - uses: actions/upload-artifact@v4
         name: 🚀 Upload website as artifact
         if: ${{ github.event_name == 'pull_request' }}
diff --git a/landing-pages/site/static/.htaccess 
b/landing-pages/site/static/.htaccess
index 647d025fa2..3eb8eb51a4 100644
--- a/landing-pages/site/static/.htaccess
+++ b/landing-pages/site/static/.htaccess
@@ -1,6 +1,8 @@
 RewriteEngine On
 
 RewriteCond %{REQUEST_URI} ^/docs [NC]
+RewriteCond %{REQUEST_URI} !^/docs/index\.html$ [NC]
+RewriteCond %{REQUEST_URI} !^/docs/index\.xml$ [NC]
 RewriteRule (.*) https://d7fnmbhf26p21.cloudfront.net/$1 [P]
 
 RedirectMatch Permanent ^/docs/(stable|1.10.10)/api(\.html)?$ 
"https://airflow.apache.org/docs/apache-airflow/$1/rest-api-ref";