Merge pull request #436 from w3c/main

For publication / deploy on Tuesday September 30, 2025

Author: remibetin

.github/workflows/pr-create.yml

@@ -46,6 +46,26 @@ jobs:
 
       - name: Update git submodules
         run: |
+          # Deinit and reinit submodules
+          echo "Deinitializing existing submodules..."
+          git submodule deinit -f "_external/aria-practices" || true
+          git submodule deinit -f "_external/data" || true
+          
+          # Remove stale directories
+          if [ -d "_external/aria-practices" ]; then
+            echo "Removing stale aria-practices directory..."
+            rm -rf "_external/aria-practices"
+          fi
+          if [ -d "_external/data" ]; then
+            echo "Removing stale data directory..."
+            rm -rf "_external/data"
+          fi
+          
+          # Reinitialize submodules
+          echo "Initializing submodules..."
+          git submodule update --init --recursive
+          
+          # Update from remote and handle fork if exists
           git submodule update --recursive --remote
           cd _external/aria-practices
           if [ -n "${{ github.event.inputs.fork_path }}" ] && [ "${{ github.event.inputs.fork_path }}" != 'false' ]; then
@@ -69,32 +89,52 @@ jobs:
 
           # Handle cases where the aria-practices submodule has conflicts to be handled;
           # _external/data shouldn't have conflicting changes
-          if [ -d "_external/aria-practices" ] && { [ -f ".git/rebase-apply" ] || [ -d ".git/rebase-merge" ]; }; then
+          while { [ -f ".git/rebase-apply" ] || [ -d ".git/rebase-merge" ]; }; do
             echo "Handling submodule conflicts..."
-            cd _external/aria-practices
 
-            # Resolve the conflict
-            git fetch origin
-            git merge origin/main
+            # Handle submodule conflicts first if they exist
+            if [ -d "_external/aria-practices" ]; then
+              echo "Checking for submodule conflicts..."
+              cd _external/aria-practices
 
-            # Add resolved submodule from project root
-            cd -
-            git add _external/aria-practices
+              # If submodule has conflicts, resolve them
+              if [ -f ".git/MERGE_HEAD" ] || [ -d ".git/rebase-merge" ] || [ -f ".git/rebase-apply" ]; then
+                echo "Resolving submodule conflicts..."
+                git fetch origin
+                git merge origin/main
+              fi
 
-            # Continue the rebase
-            GIT_EDITOR=true git rebase --continue || true
+              # Add resolved submodule from project root
+              cd -
+              git add _external/aria-practices
+            fi
 
             # Resolve conflicts for all other conflicting files automatically using 'theirs' from project root
+            echo "Resolving file conflicts..."
             git diff --name-only --diff-filter=U | while read -r file; do
+              echo "Resolving conflict in: $file"
               git checkout --theirs "$file"
               git add "$file"
             done
 
             # Continue the rebase
-            GIT_EDITOR=true git rebase --continue || true
-          else
-            echo "No submodule conflicts detected or no rebase in progress."
-          fi
+            echo "Continuing rebase..."
+            GIT_EDITOR=true git rebase --continue || {
+              echo "Rebase continue failed, checking if more conflicts exist..."
+              # If rebase failed, check if due to more conflicts
+              if { [ -f ".git/rebase-apply" ] || [ -d ".git/rebase-merge" ]; }; then
+                echo "More conflicts detected, continuing to resolve..."
+                continue
+              else
+                echo "Rebase completed or failed for other reasons"
+                break
+              fi
+            }
+
+            echo "Submodule conflicts fix step completed successfully"
+          done
+
+          echo "No submodule conflicts detected or no rebase in progress"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "_external/aria-practices"]
 	path = _external/aria-practices
 	url = https://github.com/w3c/aria-practices.git
-    branch = main
+	branch = main
 [submodule "_external/data"]
 	path = _external/data
 	url = https://github.com/w3c/wai-website-data.git

ARIA/apg/about/change-history/change-history.md

@@ -79,7 +79,7 @@ lang: en
           <li>Improved support for high contrast settings and added detailed documentation of high contrast support in many examples.</li>
           <li>Improved support for touch-based screen readers in several examples, most notably in sliders.</li>
           <li>Due to change in ARIA 1.2, removed Math role from list of roles that have presentational children.</li>
-          <li>Developed a <a href="https://github.com/w3c/aria-practices/wiki/Code-Guide#apg-coding-standards">comprehensive set of coding standards for HTML, CSS, and Javascript</a> for the APG and updated a significant portion of content to conform with the standards.</li>
+          <li>Developed a <a href="https://github.com/w3c/aria-practices/wiki/Code-Guide#apg-coding-standards">comprehensive set of coding standards for HTML, CSS, and JavaScript</a> for the APG and updated a significant portion of content to conform with the standards.</li>
           <li>In response to feedback, fixed many documentation errors and functional bugs in examples.</li>
       </ul>
       <p>Comprehensive lists of closed issues included in APG 1.2 release 1 are tracked in the following GitHub milestones.</p>