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

kranti pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/iggy-website.git


The following commit(s) were added to refs/heads/staging by this push:
     new d08488dcb staging and prod website deployment configs
d08488dcb is described below

commit d08488dcbbed7670b7c076235b0b218ab235bedf
Author: kparisa <[email protected]>
AuthorDate: Sat Jul 12 17:50:34 2025 -0500

    staging and prod website deployment configs
---
 .asf.yaml                    | 12 ++++++------
 .github/workflows/deploy.yml | 12 ++++++++++--
 .github/workflows/stage.yml  | 18 +++++++++++++-----
 README.md                    |  6 ++++++
 static/.asf.yaml             | 11 ++++++-----
 5 files changed, 41 insertions(+), 18 deletions(-)

diff --git a/.asf.yaml b/.asf.yaml
index 80b13aa49..640382b45 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -22,15 +22,15 @@ collaborators:
   - username: landingpro
     permission: write
   
-# Staging and publishing profile:
-staging:
-  profile: website
-  whoami: asf-staged-site
-  url: https://iggy.staged.apache.org
-
 publish:
   whoami: asf-site
 
+# Staging and publishing profile:
+staging:
+  profile: ~
+  whoami: asf-staging
+  url: https://iggy.staged.apache.org/
+
 notifications:
   commits: [email protected]
   issues: [email protected]
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 89f4964d7..dd9751b46 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -12,14 +12,20 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch full history for accurate commits
 
       - name: Install Dependencies
         run: |
           npm install
 
+      - name: Clean Build Directory
+        run: |
+          rm -rf ./build
+  
       - name: Build Apache Iggy Website
         run: |
-          npm run build
+          npm run build -- --clean
 
       - name: Copy ASF config
         run: |
@@ -34,5 +40,7 @@ jobs:
           publish_branch: asf-site
           publish_dir: ./build
           destination_dir: ./
+          force_orphan: true
           user_name: 'github-actions[bot]'
-          user_email: 'github-actions[bot]@users.noreply.github.com'
\ No newline at end of file
+          user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: 'Deploy website from main branch'
\ No newline at end of file
diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml
index d65a86576..44a05d8fd 100644
--- a/.github/workflows/stage.yml
+++ b/.github/workflows/stage.yml
@@ -12,27 +12,35 @@ jobs:
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # Fetch full history for accurate commits
 
       - name: Install Dependencies
         run: |
           npm install
 
+      - name: Clean Build Directory
+        run: |
+          rm -rf ./build
+
       - name: Build Apache Iggy Website
         run: |
-          npm run build
+          npm run build -- --clean
 
       - name: Copy ASF config
         run: |
           cp .asf.yaml ./build/.asf.yaml  # Ensure .asf.yaml is inside build 
directory
 
-      # Publish to asf-staged-site for development/staging
-      - name: Publish Iggy Website to asf-staged-site
+      # Publish to asf-staging for development/staging
+      - name: Publish Iggy Website to asf-staging
         if: github.event_name == 'push' && github.ref == 'refs/heads/staging'
         uses: peaceiris/actions-gh-pages@v4
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: asf-staged-site
+          publish_branch: asf-staging
           publish_dir: ./build
           destination_dir: ./
+          force_orphan: true
           user_name: 'github-actions[bot]'
-          user_email: 'github-actions[bot]@users.noreply.github.com'
\ No newline at end of file
+          user_email: 'github-actions[bot]@users.noreply.github.com'
+          commit_message: 'Deploy staging website from staging branch'
\ No newline at end of file
diff --git a/README.md b/README.md
index 665f4b28e..3a3483135 100644
--- a/README.md
+++ b/README.md
@@ -41,3 +41,9 @@ $ GIT_USER=<Your GitHub username> yarn deploy
 ```
 
 If you are using GitHub pages for hosting, this command is a convenient way to 
build the website and push to the `gh-pages` branch.
+
+
+### Publishing
+
+Production Website: iggy.apache.org is published from `asf-site` branch
+Staging Website: iggy.staged.apache.org is published from `asf-staging` branch
\ No newline at end of file
diff --git a/static/.asf.yaml b/static/.asf.yaml
index 69eaa60e6..7ea6c2378 100644
--- a/static/.asf.yaml
+++ b/static/.asf.yaml
@@ -14,15 +14,16 @@ github:
 collaborators:
   - username: landingpro
     permission: write
-  
-# Staging and publishing profile:
-staging:
-  profile: website
-  whoami: asf-staged-site
 
 publish:
   whoami: asf-site
 
+# Staging and publishing profile:
+staging:
+  profile: ~
+  whoami: asf-staging
+  url: https://iggy.staged.apache.org/
+
 notifications:
   commits: [email protected]
   issues: [email protected]

Reply via email to