Merge branch 'main' into vector-fault-tolerance

.github/CODEOWNERS

@@ -1,3 +1,3 @@
 # These owners will be the default owners for everything in
 # the repo
-*   @oliverhowell @amandalindsay @Rob-Hazelcast
+*   @hazelcast/documentation

.github/workflows/backport-5-4.yml → .github/workflows/backport-workflow.yml

@@ -1,40 +1,43 @@
-name: Backport changes to the 5.4.0 branch
+name: Backport changes
+
 on:
- push:
-  branches:
-   - main
+  workflow_call:
+    inputs:
+      label-to-check-for:
+        required: true
+        type: string
+      target-branch:
+        required: true
+        type: string
+
 jobs:
   backport:
-    strategy:
-      matrix:
-        branch: ['v/5.4']
     runs-on: ubuntu-latest
-    steps:
-
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-         fetch-depth: 0
-
-      - name: Set up git config
-        run: |
-          git config user.name "GitHub Actions Bot"
-          git config user.email "<>"
 
+    steps:
       - name: Check PR for backport label
         id: check_pr_labels
         uses: shioyang/[email protected]
         with:
-         github-token: ${{ secrets.GITHUB_TOKEN }}
-         labels: '["backport to 5.4"]'
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          labels: ${{ inputs.label-to-check-for }}
 
       - name: See result
         run: echo "${{ steps.check_pr_labels.outputs.result }}"
 
+      - name: Checkout repository
+        if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
       - name: Checkout maintenance branch and cherry-pick
         if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
         run: |
+          git config user.name "${GITHUB_ACTOR}"
+          git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
+
           git fetch
-          git checkout ${{ matrix.branch }}
+          git checkout ${{ inputs.target-branch }}
           git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA
           git push

.github/workflows/backport.yml

@@ -1,40 +1,36 @@
-name: Backport changes to all maintenance branches
+name: Backport changes to maintenance branches
 on:
  push:
   branches:
    - main
 jobs:
-  backport:
-    strategy:
-      matrix:
-        branch: ['v/5.0', 'v/5.1', 'v/5.2', 'v/5.3', 'v/5.4', 'v/5.5']
+  get-maintenance-branches:
     runs-on: ubuntu-latest
+    outputs:
+      branches: "['5.3', '5.4', '5.5']"
     steps:
-
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-         fetch-depth: 0
+      - run: exit 0
 
-      - name: Set up git config
-        run: |
-          git config user.name "GitHub Actions Bot"
-          git config user.email "<>"
-          
-      - name: Check PR for backport label
-        id: check_pr_labels
-        uses: shioyang/[email protected]
-        with:
-         github-token: ${{ secrets.GITHUB_TOKEN }}
-         labels: '["backport to all versions"]'
-
-      - name: See result
-        run: echo "${{ steps.check_pr_labels.outputs.result }}"
+  backport-to-all-branch:
+    needs: get-maintenance-branches
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(needs.get-maintenance-branches.outputs.branches) }}
+    uses: ./.github/workflows/backport-workflow.yml
+    with:
+      label-to-check-for: '["backport to all versions"]'
+      target-branch: v/${{ matrix.branch }}
+    secrets: inherit
 
-      - name: Checkout maintenance branch and cherry-pick
-        if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
-        run: |
-          git fetch
-          git checkout ${{ matrix.branch }}
-          git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA
-          git push
+  backport-to-specified-branch:
+    needs: get-maintenance-branches
+    strategy:
+      fail-fast: false
+      matrix:
+        branch: ${{ fromJSON(needs.get-maintenance-branches.outputs.branches) }}
+    uses: ./.github/workflows/backport-workflow.yml
+    with:
+      label-to-check-for: '["backport to ${{ matrix.branch }}"]'
+      target-branch: v/${{ matrix.branch }}
+    secrets: inherit

.github/workflows/forwardport.yml

@@ -5,36 +5,8 @@ on:
       - v/*
 jobs:
   forwardport:
-    strategy:
-      matrix:
-        branch: ['main']
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-         fetch-depth: 0
-
-      - name: Set up git config
-        run: |
-          git config user.name "GitHub Actions Bot"
-          git config user.email "<>"
-          
-      - name: Check PR for forwardport label
-        id: check_pr_labels
-        uses: shioyang/[email protected]
-        with:
-         github-token: ${{ secrets.GITHUB_TOKEN }}
-         labels: '["forwardport to snapshot"]'
-
-      - name: See result
-        run: echo "${{ steps.check_pr_labels.outputs.result }}"
-
-      - name: Checkout branch and cherry-pick
-        if: ${{ steps.check_pr_labels.outputs.result == 'true' }}
-        run: |
-          git fetch
-          git checkout ${{ matrix.branch }}
-          git cherry-pick -x --strategy=recursive -X theirs $GITHUB_SHA
-          git push
+    uses: ./.github/workflows/backport-workflow.yml
+    with:
+      label: '["forwardport to snapshot"]'
+      target-branch: main
+    secrets: inherit