diff --git a/.github/workflows/cicd-dotnet.yml b/.github/workflows/cicd-dotnet.yml index 22af067..3b836f7 100644 --- a/.github/workflows/cicd-dotnet.yml +++ b/.github/workflows/cicd-dotnet.yml @@ -103,14 +103,6 @@ jobs: solution-version: ${{ needs.version.outputs.solution-version }} secrets: inherit - dependabot-merge: - name: Dependabot Merge - if: ${{ github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' }} - uses: ./.github/workflows/step-dependabot-merge.yml - needs: - - tests - secrets: inherit - build: name: Build uses: ./.github/workflows/step-dotnet-build.yml @@ -125,6 +117,14 @@ jobs: solution: ${{ inputs.solution }} secrets: inherit + dependabot-merge: + name: Dependabot Merge + if: ${{ github.event_name == 'pull_request' && github.actor == 'dependabot[bot]' }} + uses: ./.github/workflows/step-dependabot-merge.yml + needs: + - build + secrets: inherit + publish-nuget: name: Publish NuGet if: ${{ inputs.disablePublish == false && github.actor != 'dependabot[bot]' }} diff --git a/.github/workflows/dependabot-merge.yml b/.github/workflows/dependabot-merge.yml index 3185ddf..ae8da97 100644 --- a/.github/workflows/dependabot-merge.yml +++ b/.github/workflows/dependabot-merge.yml @@ -10,8 +10,9 @@ jobs: steps: - name: Dependabot Auto Merge - uses: ahmadnassri/action-dependabot-auto-merge@v2.6.6 + uses: dailydevops/dependamerge-action@main with: - target: minor - github-token: ${{ secrets.DEPENDABOT }} - command: squash and merge \ No newline at end of file + token: ${{ secrets.DEPENDABOT }} + command: squash + handle-submodule: true + target: minor \ No newline at end of file diff --git a/.github/workflows/step-dependabot-merge.yml b/.github/workflows/step-dependabot-merge.yml index 799d14b..c0b4676 100644 --- a/.github/workflows/step-dependabot-merge.yml +++ b/.github/workflows/step-dependabot-merge.yml @@ -16,3 +16,4 @@ jobs: token: ${{ secrets.DEPENDABOT }} command: squash handle-submodule: true + target: minor