Implement fixed branch strategy for workflows

Changes:

- Replace timestamped branches with fixed branch (workflow-artifact-data)

- Add automatic PR lifecycle management (close old, create new)

- Make both fetch-sfs and upcoming-changes use same branch

- Simplify html-export trigger to always use fixed branch

Benefits:

- Eliminates branch proliferation

- Single coordination point for data updates

- No manual cleanup needed

- Temporal branches remain separate

Author: marcarl

.github/workflows/fetch-sfs-workflow.yml

@@ -93,12 +93,22 @@ jobs:
           echo "Inga nya filer att committa"
           echo "has_changes=false" >> $GITHUB_OUTPUT
         else
-          # Create a unique branch name for the commits
-          TIMESTAMP=$(date +'%Y%m%d_%H%M%S')
-          COMMIT_BRANCH="sfs_updates_${TIMESTAMP}"
-          
-          # Create and switch to the new branch
-          git checkout -b "$COMMIT_BRANCH"
+          # Use fixed branch name from input (default: workflow-artifact-data)
+          COMMIT_BRANCH="${{ inputs.branch_name }}"
+
+          # Check if branch exists remotely
+          if git ls-remote --heads origin "$COMMIT_BRANCH" | grep -q "$COMMIT_BRANCH"; then
+            echo "📥 Branch '$COMMIT_BRANCH' exists, checking out and merging with main..."
+            # Branch exists - fetch and checkout
+            git fetch origin "$COMMIT_BRANCH"
+            git checkout "$COMMIT_BRANCH"
+            # Merge latest main into fixed branch to keep it updated
+            git merge origin/main --no-edit --strategy-option theirs || echo "Merge completed (conflicts auto-resolved)"
+          else
+            echo "🆕 Branch '$COMMIT_BRANCH' doesn't exist, creating new..."
+            # Branch doesn't exist - create new
+            git checkout -b "$COMMIT_BRANCH"
+          fi
 
           # Commit with multi-line message
           git commit -m "Automatisk uppdatering av SFS-författningar $(date +'%Y-%m-%d')" \
@@ -139,11 +149,28 @@ jobs:
             echo "::error::Git push misslyckades: ${PUSH_ERROR}"
             exit 1
           fi
-          
+
+          # Manage PR lifecycle: close old, create new
+          echo "🔄 Hanterar PR för branch '$COMMIT_BRANCH'..."
+
+          # Close existing PR for this branch if it exists
+          EXISTING_PR=$(gh pr list --head "$COMMIT_BRANCH" --json number --jq '.[0].number' 2>/dev/null || echo "")
+          if [ -n "$EXISTING_PR" ]; then
+            echo "Stänger befintlig PR #$EXISTING_PR"
+            gh pr close "$EXISTING_PR" --comment "🔄 Stänger för att öppna ny PR med uppdaterad data från $(date +'%Y-%m-%d %H:%M')"
+          fi
+
+          # Create new PR
+          echo "📝 Skapar ny PR..."
+          gh pr create --base main --head "$COMMIT_BRANCH" \
+            --title "SFS Data Update - $(date +'%Y-%m-%d %H:%M')" \
+            --body "Automatisk uppdatering av SFS-data. Inkluderar Käll-JSON, Markdown med selex-taggar och backup till R2. Workflow: fetch-sfs-workflow, Branch: $COMMIT_BRANCH, Run: ${{ github.run_id }}" \
+            || echo "⚠️ PR may already exist"
+
           # Switch back to original branch
           git checkout "$CURRENT_BRANCH"
-          
-          echo "Commits gjorda i branch '${COMMIT_BRANCH}' istället för '${CURRENT_BRANCH}'"
+
+          echo "✅ Commits gjorda i branch '${COMMIT_BRANCH}'"
         fi
 
     - name: Trigger HTML export workflow
@@ -152,10 +179,8 @@ jobs:
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
         script: |
-          const enableGitCommit = '${{ inputs.enable_git_commit }}' !== 'false';
-          const sourceRef = enableGitCommit
-            ? '${{ steps.commit_changes.outputs.commit_branch }}'
-            : '${{ inputs.branch_name }}';
+          // Always use the fixed branch name
+          const sourceRef = '${{ inputs.branch_name }}';
 
           github.rest.actions.createWorkflowDispatch({
             owner: context.repo.owner,

.github/workflows/upcoming-changes-workflow.yml

@@ -54,13 +54,28 @@ jobs:
 
     - name: Commit and push kommande.yaml updates
       run: |
-        # Lägg till den uppdaterade kommande.yaml filen
+        # Checkout the same fixed branch as fetch-sfs uses
+        WORKFLOW_BRANCH="workflow-artifact-data"  # Match default from fetch-sfs
+
+        # Fetch and checkout the fixed branch
+        echo "📥 Checking out fixed branch '$WORKFLOW_BRANCH'..."
+        git fetch origin "$WORKFLOW_BRANCH" 2>/dev/null || echo "Branch doesn't exist yet"
+
+        if git ls-remote --heads origin "$WORKFLOW_BRANCH" | grep -q "$WORKFLOW_BRANCH"; then
+          git checkout "$WORKFLOW_BRANCH"
+          echo "✅ Checked out existing branch '$WORKFLOW_BRANCH'"
+        else
+          git checkout -b "$WORKFLOW_BRANCH"
+          echo "🆕 Created new branch '$WORKFLOW_BRANCH'"
+        fi
+
+        # Make changes
         git add output/kommande.yaml
 
         if git diff --staged --quiet; then
           echo "Inga ändringar i kommande.yaml"
         else
           git commit -m "Uppdatera kommande ändringar - $(date +'%Y-%m-%d')"
-          git push
-          echo "✅ Kommande.yaml har uppdaterats och pushats"
+          git push origin "$WORKFLOW_BRANCH"
+          echo "✅ Kommande.yaml uppdaterat på branch $WORKFLOW_BRANCH"
         fi