Skip to content

Commit e02313f

Browse files
Merge branch 'main' into v6
2 parents 560d90c + 8b9aa18 commit e02313f

5 files changed

Lines changed: 13 additions & 10 deletions

File tree

.github/workflows/cancel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Cancel Workflows
33
on:
44
push:
55
branches-ignore:
6-
- master
6+
- main
77

88
jobs:
99
cancel:

.github/workflows/code-quality.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: code-quality
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88
env:
99
CI: true

.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66
pull_request:
7-
branches: [master]
7+
branches: [main]
88

99
jobs:
1010
analyze:

.github/workflows/docs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Documentation
33
on:
44
push:
55
branches:
6-
- master
6+
- main
77
pull_request:
88

99
jobs:
@@ -22,9 +22,9 @@ jobs:
2222
- name: Build docs
2323
run: npm run docs-build
2424

25-
- name: Deploy docs 🚀
25+
- name: Deploy 🚀
2626
if: github.ref == 'refs/heads/main'
27-
uses: JamesIves/github-pages-deploy-action@v4.4.1
27+
uses: JamesIves/github-pages-deploy-action@v4.4.2
2828
with:
2929
branch: gh-pages
3030
folder: docs

package-lock.json

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)