Merge pull request #163 from NREL/develop

auto sync develop from main

Author: RLiNREL

.github/workflows/sync-develop.yml

@@ -0,0 +1,82 @@
+name: Sync develop with main
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    timeout-minutes: 5
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          
+      - name: Fetch latest branches
+        run: |
+          git fetch origin main
+          git fetch origin develop
+          
+      - name: Create sync branch
+        run: |
+          git checkout -b sync/main-to-develop-${{ github.run_number }} origin/develop
+          
+      - name: Merge main into sync branch
+        id: merge
+        run: |
+          if git merge origin/main --no-edit; then
+            echo "merge_success=true" >> $GITHUB_OUTPUT
+          else
+            echo "merge_success=false" >> $GITHUB_OUTPUT
+            echo "Merge conflict detected. Manual resolution required."
+            exit 1
+          fi
+          
+      - name: Push sync branch
+        if: steps.merge.outputs.merge_success == 'true'
+        run: |
+          git push origin sync/main-to-develop-${{ github.run_number }}
+          
+      - name: Create Pull Request
+        if: steps.merge.outputs.merge_success == 'true'
+        id: create_pr
+        uses: peter-evans/create-pull-request@v6
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: sync/main-to-develop-${{ github.run_number }}
+          base: develop
+          title: "Sync develop with main"
+          body: |
+            ## Auto-generated sync PR
+            
+            This PR syncs `develop` with the latest changes from `main`.
+            
+            **Triggered by:** Push to `main` (commit: ${{ github.sha }})
+            **Workflow run:** ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+            
+          labels: |
+            automated
+            sync
+          draft: false
+
+      - name: Enable auto-merge
+        if: steps.merge.outputs.merge_success == 'true'
+        run: |
+          PR_URL="${{ steps.create_pr.outputs.pull-request-url }}"
+          PR_NUMBER=$(echo $PR_URL | grep -oP '\d+$')
+          gh pr merge $PR_NUMBER --auto --merge
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}