Merge branch 'main' into dependabot/npm_and_yarn/npm-000c262e2a

kjy5 · Feb 12, 2024 · 544c404 · 544c404
2 parents 04e096f + 9d23367
commit 544c404
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,6 +3,9 @@ name: Build Website
 # Controls when the workflow will run
 on:
   pull_request:
+  push:
+    branches:
+      - main
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -26,7 +29,7 @@ jobs:
 
       # Setup PNPM
       - name: 🟨 Setup PNPM
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: latest
 

diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -17,4 +17,4 @@ jobs:
       - name: 'Checkout Repository'
         uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4
diff --git a/.github/workflows/reformat-and-lint.yml b/.github/workflows/reformat-and-lint.yml
@@ -2,6 +2,9 @@ name: Reformat and Lint
 
 on:
   pull_request:
+  push:
+    branches:
+      - main
   workflow_dispatch:
 
 jobs:
@@ -19,7 +22,7 @@ jobs:
 
       # Setup PNPM
       - name: 🟨 Setup PNPM
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v3
         with:
           version: latest
 
@@ -40,6 +43,7 @@ jobs:
         run: pnpm lint
 
       - name: ⬆️ Commit changes
+        if: github.ref != 'refs/heads/main'
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
           commit_message: Reformat and Lint