Skip to content

Commit

Permalink
ci(all): fix
Browse files Browse the repository at this point in the history
  • Loading branch information
NexZhu committed Dec 4, 2023
1 parent be90b0e commit 4fd2041
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 47 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ step_checkout: &step_checkout
ssh-strict: false

step_setup_pnpm: &step_setup_pnpm
uses: https://github.com/pnpm/action-setup@v2
uses: pnpm/action-setup@v2
with:
version: 8

Expand All @@ -40,7 +40,7 @@ step_build_lint_main: &step_build_lint_main
name: build-lint:main
if: github.ref == 'refs/heads/main'
run: |
concurrently "pnpm prod --filter ${{ github.job }}" "pnpm lint --filter ${{ github.job }}"
concurrently "pnpm nx build -p ${{ github.job }}" "pnpm nx lint -p ${{ github.job }}"
step_build_lint_not_main: &step_build_lint_not_main
name: build-lint:!main
Expand All @@ -49,7 +49,8 @@ step_build_lint_not_main: &step_build_lint_not_main
run: |
git fetch origin main:refs/remotes/origin/main
git reset --soft refs/remotes/origin/main
concurrently "pnpm prod --filter ${{ github.job }}" "npx lefthook run pre-commit"
# FIXME: only run lefthook on project files
concurrently "pnpm nx build -p ${{ github.job }}" "npx lefthook run pre-commit"
step_docker_setup_buildx: &step_docker_setup_buildx
uses: docker/setup-buildx-action@v3
Expand Down
5 changes: 0 additions & 5 deletions .npmrc

This file was deleted.

7 changes: 0 additions & 7 deletions k8s/.eslintrc.js

This file was deleted.

1 change: 0 additions & 1 deletion k8s/.npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
registry=https://npm.internetapi.cn/
registry-supports-time-field=true
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@biomejs/biome": "1.4.0",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@daotl/biome-config": "0.0.3",
"@daotl/biome-config": "0.0.4",
"@daotl/tsconfig": "^0.1.2",
"@manypkg/cli": "npm:@daotl/manypkg-cli@^0.21.0",
"commitiquette": "^1.2.1",
Expand Down
60 changes: 30 additions & 30 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 4fd2041

Please sign in to comment.