Changes in 7eea82a: Merge branch 'main' into bug6170

				.github/workflows/merge-main-into-docker-24.yml
			
          @@ -1,29 +0,0 @@

          -name: Merge main branch into docker-24 after successful build

          -on:

          -  workflow_run:

          -    workflows: [release]

          -    types: [completed]

          -    branches: [main]

          -  workflow_dispatch: {}

          -jobs:

          -  merge-main-into-docker-24:

          -    permissions:

          -      contents: write

          -    if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}

          -    runs-on: ubuntu-latest

          -    steps:

          -      - name: Checkout

          -        uses: actions/checkout@v4

          -        with:

          -          ref: docker-24

          -          fetch-depth: 0  # fetch the whole thing to make sure the histories merge

          -      - name: Merge main into docker-24

          -        uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # v1.4.0

          -        env:

          -          GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}

          -        with:

          -          type: now

          -          from_branch: main

          -          target_branch: docker-24

          -          message: Auto-merging main into docker-24 after successful release build

          -          github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}

...	...	@@ -1,29 +0,0 @@
1		-name: Merge main branch into docker-24 after successful build
2		-on:
3		- workflow_run:
4		- workflows: [release]
5		- types: [completed]
6		- branches: [main]
7		- workflow_dispatch: {}
8		-jobs:
9		- merge-main-into-docker-24:
10		- permissions:
11		- contents: write
12		- if: ${{ github.event_name == 'workflow_dispatch' \|\| github.event.workflow_run.conclusion == 'success' }}
13		- runs-on: ubuntu-latest
14		- steps:
15		- - name: Checkout
16		- uses: actions/checkout@v4
17		- with:
18		- ref: docker-24
19		- fetch-depth: 0 # fetch the whole thing to make sure the histories merge
20		- - name: Merge main into docker-24
21		- uses: devmasx/merge-branch@854d3ac71ed1e9deb668e0074781b81fdd6e771f # v1.4.0
22		- env:
23		- GH_TOKEN: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}
24		- with:
25		- type: now
26		- from_branch: main
27		- target_branch: docker-24
28		- message: Auto-merging main into docker-24 after successful release build
29		- github_token: ${{ secrets.REPO_TOKEN_FOR_MERGE_AND_PUSH }}