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
4 changes: 2 additions & 2 deletions .github/workflows/merge-bot-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- name: Merge pull request step
if: steps.metadata.outputs.update-type != 'version-update:semver-major'
run: gh pr merge --auto --merge "$PR_URL"
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
Expand All @@ -43,7 +43,7 @@ jobs:
steps:

- name: Merge pull request step
run: gh pr merge --auto --merge "$PR_URL"
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
6 changes: 2 additions & 4 deletions .github/workflows/run-codegen-pull-request-task.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Run codegen and pull request task

env:
PROJECT_FILE: ./CodeGen/CodeGen.csproj

on:
workflow_call:

Expand All @@ -24,7 +21,7 @@ jobs:

- name: Run codegen step
run: >-
dotnet run --project ${{ env.PROJECT_FILE }} --
dotnet run --project ./CodeGen/CodeGen.csproj --
--codepath ./CodeGen

- name: Format code step
Expand All @@ -42,3 +39,4 @@ jobs:
body: 'This PR updates the codegen files.'
commit-message: 'Update codegen files'
delete-branch: true
sign-commits: true