Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 10 additions & 2 deletions .github/workflows/dependabot-auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,24 @@ jobs:
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"

- name: Generate app token
id: app-token
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
uses: actions/create-github-app-token@fee1f7d63c2ff003460e3d139729b119787bc349 # v2
with:
app-id: ${{ secrets.DEPENDABOT_AUTOMERGE_APP_ID }}
private-key: ${{ secrets.DEPENDABOT_AUTOMERGE_PRIVATE_KEY }}
Comment on lines +27 to +28

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Avoid secrets in Dependabot pull_request_target runs

Because this job is restricted to dependabot[bot] pull_request_target events, these newly referenced app credentials are not available in the run; GitHub's secret-type docs state that Dependabot-initiated pull_request_target workflows receive a read-only GITHUB_TOKEN and no secrets (https://docs.github.com/en/code-security/reference/secret-security/secret-types#dependabot-secrets). As a result, actions/create-github-app-token will receive empty app credentials and fail before the approval/auto-merge steps for every eligible Dependabot patch/minor PR. Use a hand-off workflow under a non-Dependabot actor or another supported credential path.

Useful? React with 👍 / 👎.


- name: Approve PR
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
run: gh pr review --approve "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ steps['app-token'].outputs.token }}

- name: Enable auto-merge for Dependabot PRs
if: steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{ github.event.pull_request.html_url }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GH_TOKEN: ${{ steps['app-token'].outputs.token }}
30 changes: 15 additions & 15 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<ItemGroup>
<PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.18.1" />
<PackageVersion Include="AutoFixture.Xunit3" Version="4.19.0" />
<PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.101" />
<PackageVersion Include="AwesomeAssertions" Version="9.5.0" />
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.101.4" />
<PackageVersion Include="Humanizer.Core" Version="3.0.10" />
<PackageVersion Include="LayeredCraft.DynamoMapper" Version="1.6.4" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.300" />
<!-- Testing Libraries -->
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
<PackageVersion Include="JetBrains.Annotations" Version="2026.2.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
<PackageVersion Include="Testcontainers.DynamoDb" Version="4.13.0" />
Expand All @@ -28,9 +28,9 @@
</ItemGroup>
<PropertyGroup Label="EF Core version selection">
<EFCoreVersion Condition="'$(Configuration)' == 'Debug EF11' Or '$(Configuration)' == 'Release EF11'">
11.0.0-preview.5.26302.115
[11.0.0-preview.5.26302.115, 12.0.0-a)
</EFCoreVersion>
<EFCoreVersion Condition="'$(EFCoreVersion)' == ''">10.0.9</EFCoreVersion>
<EFCoreVersion Condition="'$(EFCoreVersion)' == ''">[10.0.10, 11.0.0)</EFCoreVersion>
</PropertyGroup>
<ItemGroup Label="Microsoft EF Core">
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="$(EFCoreVersion)" />
Expand All @@ -39,17 +39,17 @@
<PackageVersion Include="Microsoft.EntityFrameworkCore.Specification.Tests" Version="$(EFCoreVersion)" />
</ItemGroup>
<ItemGroup Label="Microsoft Extensions net10" Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="10.0.9" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="[10.0.10, 11.0.0)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[10.0.10, 11.0.0)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[10.0.10, 11.0.0)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="[10.0.10, 11.0.0)" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="[10.0.10, 11.0.0)" />
</ItemGroup>
<ItemGroup Label="Microsoft Extensions net11" Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="11.0.0-preview.5.26302.115" />
<PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="[11.0.0-preview.6.26359.118, 12.0.0-a)" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="[11.0.0-preview.6.26359.118, 12.0.0-a)" />
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="[11.0.0-preview.6.26359.118, 12.0.0-a)" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="[11.0.0-preview.6.26359.118, 12.0.0-a)" />
<PackageVersion Include="Microsoft.Extensions.Primitives" Version="[11.0.0-preview.6.26359.118, 12.0.0-a)" />
</ItemGroup>
</Project>