meer auto-merge van dependencies

B3Partners · Oct 30, 2024 · b3bc9b8 · b3bc9b8
1 parent ba9e740
commit b3bc9b8
Showing 1 changed file with 32 additions and 4 deletions.
diff --git a/.github/workflows/dependabot.yml b/.github/workflows/dependabot.yml
@@ -15,11 +15,39 @@ jobs:
         uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: 'Enable auto-merge for Dependabot PRs on Maven plugins'
-        if: contains(steps.metadata.outputs.dependency-names, 'maven-') && steps.metadata.outputs.update-type == 'version-update:semver-patch'
+      - name: 'Enable auto-merge for Dependabot PRs on selected dependencies for patch and minor version updates'
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        if: |
+          ( 
+            contains(steps.metadata.outputs.dependency-names, 'junit') || 
+            contains(steps.metadata.outputs.dependency-names, 'mockito') ||
+            contains(steps.metadata.outputs.dependency-names, 'log4j') ||
+            contains(steps.metadata.outputs.dependency-names, 'commons-') ||
+            contains(steps.metadata.outputs.dependency-names, 'jackson') ||
+            contains(steps.metadata.outputs.dependency-names, 'temurin') ||
+            contains(steps.metadata.outputs.dependency-names, 'tomcat')
+          ) && (
+            steps.metadata.outputs.update-type == 'version-update:semver-patch' || 
+            steps.metadata.outputs.update-type == 'version-update:semver-minor'
+          )
         run: |
-          gh pr edit --remove-label "dependencies" "$PR_URL"
-          gh pr merge --auto --merge "$PR_URL"
+          gh pr edit --remove-label "bouw- en testinfrastuctuur" "$PR_URL"
+          gh pr merge --auto --squash "$PR_URL"
+      - name: 'Enable auto-merge for Dependabot PRs on Maven plugins and GH actions for patch and minor version updates'
         env:
           PR_URL: ${{github.event.pull_request.html_url}}
           GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        if: |
+          (
+            contains(steps.metadata.outputs.dependency-names, 'maven-') ||
+            contains(steps.metadata.outputs.dependency-names, 'action') ||
+            contains(steps.metadata.outputs.dependency-names, 'error_prone_core')
+          ) && (
+            steps.metadata.outputs.update-type == 'version-update:semver-patch' || 
+            steps.metadata.outputs.update-type == 'version-update:semver-minor'
+          )
+        run: |
+          gh pr edit --remove-label "dependency update" "$PR_URL"
+          gh pr merge --auto --squash "$PR_URL"