Merge branch '3.4.x' into 3.5.x

snicoll · snicoll · commit aed85504210a · 2025-07-22T16:36:17.000+02:00
Closes gh-46506
diff --git a/.github/actions/create-github-release/action.yml b/.github/actions/create-github-release/action.yml
@@ -1,6 +1,9 @@
 name: Create GitHub Release
 description: 'Create the release on GitHub with a changelog'
 inputs:
+  commercial:
+    description: 'Whether to generate the changelog for the commercial release'
+    required: true
   milestone:
     description: 'Name of the GitHub milestone for which a release will be created'
     required: true
@@ -11,9 +14,6 @@ inputs:
   token:
     description: 'Token to use for authentication with GitHub'
     required: true
-  commercial:
-    description: 'Whether to generate the changelog for the commercial release'
-    required: true
 runs:
   using: composite
   steps:
diff --git a/.github/workflows/release-milestone.yml b/.github/workflows/release-milestone.yml
@@ -89,6 +89,7 @@ jobs:
       - name: Create GitHub Release
         uses: ./.github/actions/create-github-release
         with:
+          commercial: ${{ vars.COMMERCIAL }}
           milestone: ${{ needs.build-and-stage-release.outputs.version }}
           pre-release: true
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -172,6 +172,6 @@ jobs:
       - name: Create GitHub Release
         uses: ./.github/actions/create-github-release
         with:
+          commercial: ${{ vars.COMMERCIAL }}
           milestone: ${{ needs.build-and-stage-release.outputs.version }}
           token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-          commercial: ${{ vars.COMMERCIAL }}
