From 47a928c6306e48da3b5da8ce34678a12fc64ff7b Mon Sep 17 00:00:00 2001
From: SBsudo <sebastian@ipf-mail.com>
Date: Thu, 7 Nov 2024 00:02:55 -0500
Subject: [PATCH] test deployment

---
 .github/workflows/demo-deploy.yml | 70 +++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/demo-deploy.yml b/.github/workflows/demo-deploy.yml
index 82c35d7e1..929edde83 100644
--- a/.github/workflows/demo-deploy.yml
+++ b/.github/workflows/demo-deploy.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Checkout repository
       uses: actions/checkout@v3
       with:
-        submodules: recursive
+        submodules: recursive  # Initializes and updates submodules automatically
 
     # Step 2: Set up Node.js and Bower
     - name: Set up Node.js
@@ -39,29 +39,34 @@ jobs:
     - name: Build Demo Files (WET-BOEW)
       run: grunt dist
     
-    # Step 4: Copy built files to gh-pages directory root
+    # Step 4: Copy built files directly to the root of the gh-pages directory
     - name: Copy Built Files to gh-pages Root
       run: |
+        # Ensure the gh-pages directory exists
         mkdir -p ${{ github.workspace }}/gh-pages
         
-        # Copy contents from ~sites and dist into gh-pages root
+        # Copy the contents of ~sites and dist directly to the root of gh-pages without retaining subdirectories
         if [ -d "./~sites" ]; then
-          rsync -av ./~sites/ ${{ github.workspace }}/gh-pages/
+        rsync -av --remove-source-files --exclude='*/' ./~sites/ ${{ github.workspace }}/gh-pages/
         fi
         if [ -d "./dist" ]; then
-          rsync -av ./dist/ ${{ github.workspace }}/gh-pages/
+        rsync -av --remove-source-files --exclude='*/' ./dist/ ${{ github.workspace }}/gh-pages/
         fi
 
-    # Step 5: Commit and Push Changes to gh-pages
-    - name: Commit and Push to gh-pages
+    # Step 5: Initialize or Update gh-pages Branch
+    - name: Initialize or Update gh-pages Branch
       run: |
-        cd ${{ github.workspace }}/gh-pages
-
-        # Configure Git for this environment
-        git config user.name "GitHub Actions"
-        git config user.email "actions@github.com"
-
-        # Check out or initialize gh-pages
+        GHPAGES_PATH="${{ github.workspace }}/gh-pages"
+        
+        # Remove gh-pages directory if it exists to start clean
+        if [ -d "$GHPAGES_PATH" ]; then
+          rm -rf "$GHPAGES_PATH"
+        fi
+        
+        # Clone the gh-pages branch if it exists, or create it if not
+        git clone https://github.com/${{ github.repository_owner }}/GCWeb.git "$GHPAGES_PATH"
+        cd "$GHPAGES_PATH"
+        
         if git rev-parse --verify origin/gh-pages; then
           git checkout gh-pages
           git pull origin gh-pages
@@ -73,9 +78,38 @@ jobs:
           git commit -m "Initialize gh-pages branch"
           git push --force origin gh-pages
         fi
+        
+        # Set Git user identity for commits in this environment
+        git config user.name "GitHub Actions"
+        git config user.email "actions@github.com"
+        
+        # Add or update the submodule for the demo if necessary
+        if [ ! -d "GCWeb" ]; then
+          git submodule add -b master https://github.com/ServiceCanada/wet-boew-demos.git GCWeb
+        fi
+        
+        # Check if .gitmodules exists before attempting to add it
+        if [ -f .gitmodules ]; then
+          git add .gitmodules
+        fi
+        git add GCWeb
+        git commit -m "Update submodule GCWeb" --allow-empty
+        git pull --rebase origin gh-pages || true  # Sync with remote, ignore rebase errors
 
-        # Stage and commit all changes to gh-pages
-        git add .
-        git commit -m "Update gh-pages with new demo files" --allow-empty
-        git pull --rebase origin gh-pages || true
+    # Step 6: Configure Remote with GitHub Token for Authentication
+    - name: Configure Remote with GitHub Token
+      run: |
+        cd ${{ github.workspace }}/gh-pages
+        # Set the remote URL to use the GitHub token for authentication
+        git remote set-url origin https://${{ secrets.GH_PAT }}@github.com/${{ github.repository_owner }}/GCWeb.git
+
+    # Step 7: Force Push to gh-pages
+    - name: Force Push to gh-pages
+      run: |
+        cd ${{ github.workspace }}/gh-pages
+        # Repack the repository to avoid any potential issues with large or corrupt objects
+        git gc --prune=now
+        git repack -a -d --depth=250 --window=250
+        # Force push changes to gh-pages with authentication
         git push origin gh-pages --force
+