Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/nuget/CreateMatrix/develop/Jso…
Browse files Browse the repository at this point in the history
…nSchema.Net.Generation-4.5.0
ptr727 authored Jul 26, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents daa5f59 + 3302c36 commit 23172fc
Showing 2 changed files with 36 additions and 1 deletion.
35 changes: 35 additions & 0 deletions .github/workflows/DependabotAutoMerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Dependabot auto-merge

on:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:

dependabot:
name: Dependabot auto-merge
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write

if: github.actor == 'dependabot[bot]'

steps:

# https://github.com/marketplace/actions/fetch-metadata-from-dependabot-prs
# https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request
- name: Dependabot metadata
id: metadata
uses: dependabot/fetch-metadata@v2
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Auto-merge dependabot non-major updates
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
run: gh pr merge --auto --merge "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
2 changes: 1 addition & 1 deletion CreateMatrix/CreateMatrix.csproj
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@

<ItemGroup>
<PackageReference Include="JsonSchema.Net.Generation" Version="4.5.0" />
<PackageReference Include="Serilog" Version="4.0.0" />
<PackageReference Include="Serilog" Version="4.0.1" />
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
</ItemGroup>

0 comments on commit 23172fc

Please sign in to comment.