Merge branch 'main' of github.com:romkey/pdxhackerspace-hackstack

Author: romkey

.github/workflows/concatenate_gitignore.yml

@@ -3,7 +3,8 @@ name: Update .gitignore
 on:
   push:
     paths:
-      - "**/.gitignore"
+      - "apps/**/.gitignore"
+      - "experimental/**/.gitignore"
       - ".gitignore.initial"
   workflow_dispatch:
 
@@ -22,12 +23,24 @@ jobs:
         run: |
           # Start with the initial .gitignore file
           cp .gitignore.initial .gitignore
-          
-          # Find all .gitignore files one level down, process each with its path prefix
-          find . -mindepth 2 -maxdepth 2 -name ".gitignore" | while read -r gitignore_file; do
-            dir_path=$(dirname "$gitignore_file" | sed 's|^\./||')
-            echo -e "\n# Patterns from $dir_path/.gitignore" >> .gitignore
-            sed "s|^|$dir_path/|" "$gitignore_file" >> .gitignore
+
+          # Process each known parent directory in order.
+          # Patterns are prefixed with the full path from the repo root so
+          # they work correctly from the top-level .gitignore.
+          # The section header names the parent directory so the origin of
+          # each block is clear.
+          for parent_dir in apps experimental; do
+            if [ ! -d "$parent_dir" ]; then
+              continue
+            fi
+
+            find "$parent_dir" -mindepth 2 -maxdepth 2 -name ".gitignore" | sort | \
+            while read -r gitignore_file; do
+              dir_path=$(dirname "$gitignore_file")
+              echo "" >> .gitignore
+              echo "# [$parent_dir] $dir_path/.gitignore" >> .gitignore
+              sed "s|^|$dir_path/|" "$gitignore_file" >> .gitignore
+            done
           done
 
       - name: Check for changes
@@ -46,4 +59,4 @@ jobs:
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git add .gitignore
           git commit -m "Update top-level .gitignore with directory paths"
-          git push
+          git push origin HEAD:${GITHUB_REF_NAME}

.github/workflows/concatenate_rsync_exclude.yml

@@ -47,4 +47,4 @@ jobs:
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
           git add .rsync.exclude
           git commit -m "Update top-level .rsync.exclude with directory paths"
-          git push
+          git push origin HEAD:${GITHUB_REF_NAME}