HatmanStack commited on
Commit
697ca14
·
1 Parent(s): 65b2689

ci: fix auto-merge workflow flags and merge strategy

Browse files
.github/workflows/dependabot-auto-merge.yml CHANGED
@@ -14,20 +14,17 @@ jobs:
14
  steps:
15
  - uses: dependabot/fetch-metadata@v2
16
  id: meta
17
- - name: Skip major updates
18
- if: steps.meta.outputs.update-type == 'version-update:semver-major'
19
- run: |
20
- echo "Major update detected (${{ steps.meta.outputs.dependency-names }}), skipping auto-merge"
21
- exit 0
22
  - name: Wait for CI to pass
23
  if: steps.meta.outputs.update-type != 'version-update:semver-major'
24
- run: gh pr checks "$PR_URL" --watch --fail-on-pending
25
  env:
26
  PR_URL: ${{ github.event.pull_request.html_url }}
27
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
28
  - name: Auto-merge
29
  if: steps.meta.outputs.update-type != 'version-update:semver-major'
30
- run: gh pr merge --auto --merge "$PR_URL"
31
  env:
32
  PR_URL: ${{ github.event.pull_request.html_url }}
33
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
14
  steps:
15
  - uses: dependabot/fetch-metadata@v2
16
  id: meta
17
+
 
 
 
 
18
  - name: Wait for CI to pass
19
  if: steps.meta.outputs.update-type != 'version-update:semver-major'
20
+ run: gh pr checks "$PR_URL" --watch --required
21
  env:
22
  PR_URL: ${{ github.event.pull_request.html_url }}
23
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24
+
25
  - name: Auto-merge
26
  if: steps.meta.outputs.update-type != 'version-update:semver-major'
27
+ run: gh pr merge --auto --squash "$PR_URL"
28
  env:
29
  PR_URL: ${{ github.event.pull_request.html_url }}
30
  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}