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

davidarthur pushed a commit to branch markdown
in repository https://gitbox.apache.org/repos/asf/kafka-site.git


The following commit(s) were added to refs/heads/markdown by this push:
     new 9229f48c1 restore htaccess
9229f48c1 is described below

commit 9229f48c1c3be0b19ac797f9d11a1f30582c49bf
Author: David Arthur <[email protected]>
AuthorDate: Mon Oct 27 17:04:26 2025 -0500

    restore htaccess
---
 .github/workflows/build-and-deploy.yml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-and-deploy.yml 
b/.github/workflows/build-and-deploy.yml
index 9a59b61a1..65f5d742c 100644
--- a/.github/workflows/build-and-deploy.yml
+++ b/.github/workflows/build-and-deploy.yml
@@ -45,7 +45,9 @@ jobs:
       run: |
         # Create scratch space for staging branch
         mkdir asf-staging
+
         cd asf-staging
+
         # Check if asf-staging branch exists
         if git show-ref --verify --quiet refs/remotes/origin/asf-staging; then
           echo "asf-staging branch exists, checking it out"
@@ -54,14 +56,18 @@ jobs:
           echo "asf-staging branch doesn't exist!"
           exit 1
         fi
+
+        # Remove existing contents
+        rm -rf *
     
-    - name: Copy build output to asf-staging branch
-      run: |
         # Copy all contents from output directory to temporary directory
         if [ -d "output" ]; then
-          cp -r output/* asf-staging 2>/dev/null || true
+          cp -r ../output/* . 2>/dev/null || true
         fi
         
+        # Restore top level files
+        git restore .htaccess .asf.yaml
+
         # Add all files
         git add .
         
@@ -69,8 +75,6 @@ jobs:
         echo "Files to be committed:"
         git status --porcelain
     
-    - name: Commit and push to asf-staging branch
-      run: |
         # Check if there are changes to commit
         if git diff --staged --quiet; then
           echo "No changes to commit"

Reply via email to