Skip to content

Commit dd1f935

Browse files
committed
Changing auto merge command to merge strategy instead of squash
1 parent fb8a33e commit dd1f935

File tree

5 files changed

+2
-43
lines changed

5 files changed

+2
-43
lines changed

.changeset/eighty-nails-peel.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/shaggy-moons-dance.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.github/workflows/changeset-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,6 @@ jobs:
8686

8787
# Enable auto-merge for the PR
8888
- name: Enable automerge on PR
89-
run: gh pr merge --squash --auto ${{ github.event.pull_request.number }}
89+
run: gh pr merge --merge --auto ${{ github.event.pull_request.number }}
9090
env:
9191
GH_TOKEN: ${{ secrets.CROSS_REPO_ACCESS_TOKEN }}

.github/workflows/marketplace-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
jobs:
88
publish-extension:
99
runs-on: ubuntu-latest
10-
if: ${{ github.actor == 'R00-B0T'}}
10+
if: ${{ github.actor == 'R00-B0T' || github.event_name == 'workflow_dispatch' }}
1111
steps:
1212
- uses: actions/checkout@v3
1313
- uses: actions/setup-node@v3

.github/workflows/temp-marketplace-publish.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

0 commit comments

Comments
 (0)