Merge branch '1.3.x' into 1.4.x

micrometer-metrics · Jan 17, 2025 · 28d5325 · 28d5325
2 parents 21f3841 + 3319f6e
commit 28d5325
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml
@@ -17,7 +17,14 @@ jobs:
             echo "target=patch" >> $GITHUB_OUTPUT
           fi
 
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@4c5d6e7f8a9b0c1d2e3f4a5b6c7d8e9f0a1b2c3d
         with:
-          github-token: ${{ secrets.GH_ACTIONS_REPO_TOKEN }}
-          target: ${{ steps.set-target.outputs.target }}
+          github-token: "${{ secrets.GH_ACTIONS_REPO_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.metadata.outputs.update-type == format('version-update:semver-{0}', steps.set-target.outputs.target)
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GH_ACTIONS_REPO_TOKEN}}