Skip to content

fix(auto-merge): handle conditions when a PR event is dispatched, but no #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fredbi merged 1 commit into from
Jan 27, 2026
Merged

fix(auto-merge): handle conditions when a PR event is dispatched, but no #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 20 additions & 11 deletions .github/workflows/auto-merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,20 @@ jobs:
contents: write
pull-requests: write
runs-on: ubuntu-latest
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' }}
if: ${{ github.event.pull_request.user.login == 'dependabot[bot]' && github.event.pull_request.html_url != '' }}
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Dependabot metadata
-
name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@21025c705c08248db411dc16f3619e6b5f9ea21a # v2.5.0
- name: Auto-approve all dependabot PRs
-
name: Auto-approve all dependabot PRs
run: gh pr review --approve "$PR_URL"
- name: Auto-merge dependabot PRs for development dependencies
-
name: Auto-merge dependabot PRs for development dependencies
if: ${{ contains(steps.metadata.outputs.dependency-group, 'development-dependencies') }}
run: |
set +e # Don't exit on error
Expand All @@ -65,7 +68,8 @@ jobs:
echo "::error title=auto-merge::Failed to enable auto-merge"
echo "$OUTPUT"
exit $EXIT_CODE
- name: Auto-merge dependabot PRs for go-openapi patches
-
name: Auto-merge dependabot PRs for go-openapi patches
if: ${{ contains(steps.metadata.outputs.dependency-group, 'go-openapi-dependencies') && (steps.metadata.outputs.update-type == 'version-update:semver-minor' || steps.metadata.outputs.update-type == 'version-update:semver-patch') }}
run: |
set +e # Don't exit on error
Expand All @@ -84,7 +88,8 @@ jobs:
echo "::error title=auto-merge::Failed to enable auto-merge"
echo "$OUTPUT"
exit $EXIT_CODE
- name: Auto-merge dependabot PRs for golang.org updates
-
name: Auto-merge dependabot PRs for golang.org updates
if: ${{ contains(steps.metadata.outputs.dependency-group, 'golang-org-dependencies') }}
run: |
set +e # Don't exit on error
Expand Down Expand Up @@ -115,21 +120,25 @@ jobs:
contents: write
pull-requests: write
runs-on: ubuntu-latest
if: ${{ inputs.enable-organization-bot == 'true' && github.event.pull_request.user.login == inputs.organization-bot }}
if: ${{ inputs.enable-organization-bot == 'true' && github.event.pull_request.user.login == inputs.organization-bot && github.event.pull_request.html_url != '' }}
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout repository
-
name: Checkout repository
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
- name: Auto-approve all bot-go-openapi PRs
-
name: Auto-approve all bot-go-openapi PRs
run: gh pr review --approve "$PR_URL"
- name: Wait for all workflow runs to complete
-
name: Wait for all workflow runs to complete
uses: go-openapi/gh-actions/ci-jobs/wait-pending-jobs@f7ed44020a2682556ac42fa9c210142495270354 # v1.4.5
with:
pr-url: ${{ env.PR_URL }}
github-token: ${{ secrets.GITHUB_TOKEN }}
- name: Auto-merge bot-go-openapi PRs
-
name: Auto-merge bot-go-openapi PRs
run: |
set +e # Don't exit on error
OUTPUT=$(gh pr merge --auto --rebase "$PR_URL" 2>&1)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/fuzz-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ jobs:
name: Archive failed cases
if: ${{ failure() }}
run: |
tar czf fuzzcase.tgz $(find "${{ matrix.package }}/testdata/fuzz" -type f)
tar czf "fuzzcase-${{ matrix.test }}.tgz" $(find "${{ matrix.package }}/testdata/fuzz" -type f)
-
name: Upload failed cases
if: ${{ failure() }}
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
# TODO(fredbi): ideally, after uploading, we should fire a pull request to add
# this corpus to testdata.
with:
path: fuzzcase.tgz
path: fuzzcase-${{ matrix.test }}.tgz
name: '${{ runner.os }}-fuzz-corpus-failure'
retention-days: 60
-
Expand Down
Loading