Merge branch 'main' into v6

ProjectOpenSea · May 31, 2023 · e02313f · e02313f
2 parents 560d90c + 8b9aa18
commit e02313f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/cancel.yml b/.github/workflows/cancel.yml
@@ -3,7 +3,7 @@ name: Cancel Workflows
 on:
   push:
     branches-ignore:
-      - master
+      - main
 
 jobs:
   cancel:

diff --git a/.github/workflows/code-quality.yml b/.github/workflows/code-quality.yml
@@ -3,7 +3,7 @@ name: code-quality
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 env:
   CI: true

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [master]
+    branches: [main]
   pull_request:
-    branches: [master]
+    branches: [main]
 
 jobs:
   analyze:

diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -3,7 +3,7 @@ name: Documentation
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 jobs:
@@ -22,9 +22,9 @@ jobs:
       - name: Build docs
         run: npm run docs-build
 
-      - name: Deploy docs 🚀
+      - name: Deploy 🚀
         if: github.ref == 'refs/heads/main'
-        uses: JamesIves/[email protected].1
+        uses: JamesIves/[email protected].2
         with:
           branch: gh-pages
           folder: docs
diff --git a/package-lock.json b/package-lock.json