Merge branch 'master' of https://github.com/Chunnyluny/DogApparel

.github/workflows/trunk-check.yaml

@@ -1,5 +1,8 @@
 name: Pull Request
-on: [pull_request]
+on:
+  workflow_dispatch:
+  pull_request:
+    branches: [master]
 concurrency:
   group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -16,9 +19,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.6.0
 
       - name: Trunk Check
-        uses: trunk-io/[email protected]
+        uses: trunk-io/[email protected]
+
         with:
+          check-mode: all
+          cache: true
           arguments: --github-annotate-new-only=false

.mergify.yml

@@ -0,0 +1,7 @@
+pull_request_rules:
+  - name: Automatic merge on approval
+    conditions:
+      - "#approved-reviews-by>=1"
+    actions:
+      merge:
+        method: merge

.vscode/settings.json

@@ -76,3 +76,4 @@
     "rwxml.codeHighlighting.enabled": true,
     "rwxml.diagnostics.enabled": true,
 }
+