Skip to content

Commit

Permalink
Do not run prettier with pre-commit (woodpecker-ci#3196)
Browse files Browse the repository at this point in the history
To fix issues with woodpecker-ci#3190

Prettier still runs at woodpecker.

Also fix the duplication in our CI.

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
2 people authored and fernandrone committed Feb 1, 2024
1 parent 02341a5 commit 524327b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,5 @@ ci:
autoupdate_commit_msg: '[pre-commit.ci] pre-commit autoupdate'
autoupdate_schedule: monthly
# NB: hadolint not included in pre-commit.ci
skip: [check-hooks-apply, check-useless-excludes, hadolint]
skip: [check-hooks-apply, check-useless-excludes, hadolint, prettier]
submodules: false
8 changes: 5 additions & 3 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
pnpm-lock.yaml
build/
docs/versioned_docs/
docs/.docusaurus/
docs/pnpm-lock.yaml
dist/
web/components.d.ts
CHANGELOG.md
web/src/assets/dayjsLocales/

# web/ must be directly formatted from there
# to prevent conflicts with different prettier version
web/
9 changes: 7 additions & 2 deletions .woodpecker/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,9 @@ steps:
lint-editorconfig:
image: docker.io/mstruebing/editorconfig-checker:2.7.2
when:
event: pull_request
- event: pull_request
- event: push
branch: renovate/*

lint-license-header:
image: *golang_image
Expand All @@ -82,7 +84,10 @@ steps:

prettier:
image: docker.io/woodpeckerci/plugin-prettier:next
when: *when
when:
- event: pull_request
- event: push
branch: renovate/*

test:
depends_on:
Expand Down
2 changes: 1 addition & 1 deletion web/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ coverage/
LICENSE
components.d.ts
src/assets/locales/*.json
src/assets/timeAgoLocales/
src/assets/dayjsLocales/
!src/assets/locales/en.json

0 comments on commit 524327b

Please sign in to comment.