Merge branch 'main' into mdonnalley/esm

oclif · Oct 6, 2023 · c77fa64 · c77fa64
2 parents 140561a + 5c5e65b
commit c77fa64
Show file tree

Hide file tree

Showing 4 changed files with 222 additions and 542 deletions.
diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml
@@ -7,5 +7,7 @@ on:
 jobs:
   automerge:
     uses: salesforcecli/github-workflows/.github/workflows/automerge.yml@main
-    secrets: 
+    secrets:
       SVC_CLI_BOT_GITHUB_TOKEN: ${{ secrets.SVC_CLI_BOT_GITHUB_TOKEN }}
+    with:
+      mergeMethod: squash