ci(shield): release branches automation (#2363)

Author: francesco-furlan

.github/workflows/shield-branch-updater.yaml

@@ -0,0 +1,86 @@
+name: Shield Release Branch Updater
+
+on:
+  workflow_dispatch:
+    inputs:
+      kind:
+        description: 'Shield component'
+        required: true
+        default: "cluster"
+        type: choice
+        options:
+          - "cluster"
+          - "host-windows"
+          - "host-linux"
+      latest_release_version:
+        description: 'Latest release version'
+        required: true
+      next_release_version:
+        description: 'Next release version'
+        required: true
+
+permissions:
+  contents: write
+
+env:
+  CURRENT_RELEASE_BRANCH: ${{ inputs.kind }}-shield-release-${{ inputs.latest_release_version}}
+  NEXT_RELEASE_BRANCH: ${{ inputs.kind }}-shield-release-${{ inputs.next_release_version}}
+
+jobs:
+  update-current-release-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout current release branch
+        id: checkout
+        uses: actions/checkout@v5
+        continue-on-error: true
+        with:
+          ref: ${{ env.CURRENT_RELEASE_BRANCH }}
+          fetch-depth: 0
+
+      - name: Checkout main branch
+        if: steps.checkout.outcome == 'failure'
+        uses: actions/checkout@v5
+
+      - name: Create current release branch
+        if: steps.checkout.outcome == 'failure'
+        run: |
+          git checkout -b ${{ env.CURRENT_RELEASE_BRANCH }}
+          git push -u origin ${{ env.CURRENT_RELEASE_BRANCH }}
+
+      - name: Update current release branch
+        if: steps.checkout.outcome == 'success'
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+          ./scripts/shield/rebase.sh
+          git push --force-with-lease
+
+  update-next-release-branch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout next release branch
+        id: checkout
+        uses: actions/checkout@v5
+        continue-on-error: true
+        with:
+          ref: ${{ env.NEXT_RELEASE_BRANCH }}
+          fetch-depth: 0
+
+      - name: Checkout main branch
+        if: steps.checkout.outcome == 'failure'
+        uses: actions/checkout@v5
+
+      - name: Create next release branch
+        if: steps.checkout.outcome == 'failure'
+        run: |
+          git checkout -b ${{ env.NEXT_RELEASE_BRANCH }}
+          git push -u origin ${{ env.NEXT_RELEASE_BRANCH }}
+
+      - name: Update next release branch
+        if: steps.checkout.outcome == 'success'
+        run: |
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+          ./scripts/shield/rebase.sh
+          git push --force-with-lease

scripts/shield/rebase.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+function check_conflicts() {
+  # check if the only conflict is on the chart version
+  CONFLICTS=$(git --no-pager diff --cc --name-only)
+  if [[ "$CONFLICTS" = "charts/shield/Chart.yaml" ]]; then
+    echo "Chart version conflict detected, accepting the incoming change"
+
+    # Accept the main branch version for Chart.yaml
+    git checkout --ours charts/shield/Chart.yaml
+    git add charts/shield/Chart.yaml
+
+    echo "Resolved Chart.yaml conflict, continuing rebase"
+    export GIT_EDITOR=true
+    if git rebase --continue; then
+        echo "Rebase continued successfully"
+    else
+        echo "Checking for conflicts again ..."
+        check_conflicts
+    fi
+  elif [[ "$CONFLICTS" = "" ]]; then
+    echo "All conflicts resolved!"
+  else
+    echo "Unexpected conflicts detected in: $CONFLICTS"
+    git rebase --abort
+    exit 1
+  fi
+}
+
+if git pull --rebase origin main; then
+    echo "Rebased successfully!"
+else
+    echo "Rebase conflicts detected"
+    check_conflicts
+fi