diff --git a/.github/workflows/build-builder-website.yml b/.github/workflows/build-builder-website.yml index 1c771c1c06a8..5fbb3c1b57f2 100644 --- a/.github/workflows/build-builder-website.yml +++ b/.github/workflows/build-builder-website.yml @@ -47,5 +47,8 @@ jobs: repository-name: web-infra-dev/web-infra-dev.github.io branch: main folder: packages/document/builder-doc/doc_build - target-folder: builder + token: ${{ secrets.MODERN_DEPLOY_TOKEN }} + target-folder: modern-js/builder + git-config-name: gh-pages-bot + git-config-email: 41898282+github-actions[bot]@users.noreply.github.com clean: true diff --git a/.github/workflows/build-devtools-website.yml b/.github/workflows/build-devtools-website.yml index c24ff2c8c8c2..c6815aa3580b 100644 --- a/.github/workflows/build-devtools-website.yml +++ b/.github/workflows/build-devtools-website.yml @@ -47,5 +47,8 @@ jobs: repository-name: web-infra-dev/web-infra-dev.github.io branch: main folder: packages/devtools/client/dist + token: ${{ secrets.MODERN_DEPLOY_TOKEN }} target-folder: devtools/${{ github.sha }} + git-config-name: gh-pages-bot + git-config-email: 41898282+github-actions[bot]@users.noreply.github.com clean: true diff --git a/.github/workflows/build-main-website.yml b/.github/workflows/build-main-website.yml index 7bb1bf9eaf01..f17d770a9148 100644 --- a/.github/workflows/build-main-website.yml +++ b/.github/workflows/build-main-website.yml @@ -51,6 +51,10 @@ jobs: repository-name: web-infra-dev/web-infra-dev.github.io branch: main folder: packages/document/main-doc/doc_build + token: ${{ secrets.MODERN_DEPLOY_TOKEN }} + target-folder: modern-js + git-config-name: gh-pages-bot + git-config-email: 41898282+github-actions[bot]@users.noreply.github.com clean: true clean-exclude: | v1/* @@ -61,5 +65,3 @@ jobs: doc-tools/**/* module-tools/* module-tools/**/* - devtools/* - devtools/**/* diff --git a/.github/workflows/build-module-website.yml b/.github/workflows/build-module-website.yml index 9681baf90cdf..2f9a3157176e 100644 --- a/.github/workflows/build-module-website.yml +++ b/.github/workflows/build-module-website.yml @@ -47,5 +47,8 @@ jobs: repository-name: web-infra-dev/web-infra-dev.github.io branch: main folder: packages/document/module-doc/doc_build - target-folder: module-tools + token: ${{ secrets.MODERN_DEPLOY_TOKEN }} + target-folder: modern-js/module-tools + git-config-name: gh-pages-bot + git-config-email: 41898282+github-actions[bot]@users.noreply.github.com clean: true diff --git a/.husky/commit-msg b/.husky/commit-msg index f1d3ea1fb186..08207eaa3f88 100755 --- a/.husky/commit-msg +++ b/.husky/commit-msg @@ -1,8 +1,9 @@ #!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" # skip husky in CI # https://typicode.github.io/husky/guide.html#with-env-variables [ -n "$CI" ] && exit 0 +. "$(dirname -- "$0")/_/husky.sh" + npx --no-install commitlint --edit $1 diff --git a/.husky/post-checkout b/.husky/post-checkout index 53077c9a2dc3..1e6339c1c92d 100755 --- a/.husky/post-checkout +++ b/.husky/post-checkout @@ -1,10 +1,11 @@ #!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" # skip husky in CI # https://typicode.github.io/husky/guide.html#with-env-variables [ -n "$CI" ] && exit 0 +. "$(dirname -- "$0")/_/husky.sh" + # avoid conflicts in pnpm lock # https://7tonshark.com/posts/avoid-conflicts-in-pnpm-lock/ git config merge.ours.driver true diff --git a/.husky/pre-commit b/.husky/pre-commit index 0d85be4e2539..0671f0018e96 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,8 +1,9 @@ #!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" # skip husky in CI # https://typicode.github.io/husky/guide.html#with-env-variables [ -n "$CI" ] && exit 0 +. "$(dirname -- "$0")/_/husky.sh" + npx --no-install lint-staged