Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(fix): revert prettier version, fix pr-validation workflow #848

Merged
merged 1 commit into from
Jun 11, 2024
Merged

build(fix): revert prettier version, fix pr-validation workflow #848

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/validate-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ jobs:
run: echo "success='false'" >> $GITHUB_OUTPUT

premerge:
needs: [lint, test, build]
needs: [checks, lint, test, build]
if: always()
runs-on: ubuntu-latest

Expand All @@ -299,9 +299,9 @@ jobs:
echo "### :rocket: Premerge checks succeeded" >> $GITHUB_STEP_SUMMARY
env:
LINT_RESULT: ${{ needs.lint.outputs.success }}
LINT_AFFECTED_RESULT: ${{ needs.lint-affected.outputs.success || 'true' }}
LINT_AFFECTED_RESULT: ${{ needs.lint-affected.outputs.success || needs.checks.outputs.projects != '[]' }}
TEST_RESULT: ${{ needs.test.outputs.success }}
TEST_AFFECTED_RESULT: ${{ needs.test-affected.outputs.success || 'true' }}
TEST_AFFECTED_RESULT: ${{ needs.test-affected.outputs.success || needs.checks.outputs.projects != '[]' }}
BUILD_RESULT: ${{ needs.build.outputs.success }}
BUILD_AFFECTED_RESULT: ${{ needs.build-affected.outputs.success || 'true' }}
BUILD_AFFECTED_STORYBOOK_RESULT: ${{ needs.build-affected-storybook.outputs.success || 'true' }}
BUILD_AFFECTED_RESULT: ${{ needs.build-affected.outputs.success || needs.checks.outputs.projects-build != '[]' }}
BUILD_AFFECTED_STORYBOOK_RESULT: ${{ needs.build-affected-storybook.outputs.success || needs.checks.outputs.projects-build-storybook != '[]' }}
2 changes: 1 addition & 1 deletion .ncurc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"reject": ["marked", "eslint"],
"reject": ["marked", "eslint", "prettier"],
"timeout": 120000
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@
"postcss-import": "16.1.0",
"postcss-preset-env": "9.5.14",
"postcss-url": "10.1.3",
"prettier": "3.3.2",
"prettier": "3.3.0",
"prettier-stylelint": "0.4.2",
"protobufjs": "7.3.0",
"readline-sync": "1.4.10",
Expand Down
7 changes: 6 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20201,7 +20201,7 @@ preserve@^0.2.0:
resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
integrity sha512-s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==

"prettier-fallback@npm:prettier@^3", prettier@3.3.2, prettier@^3.1.1:
"prettier-fallback@npm:prettier@^3", prettier@^3.1.1:
name prettier-fallback
version "3.3.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.2.tgz#03ff86dc7c835f2d2559ee76876a3914cec4a90a"
Expand Down Expand Up @@ -20234,6 +20234,11 @@ prettier-stylelint@0.4.2:
tempy "^0.2.1"
update-notifier "^2.2.0"

prettier@3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.3.0.tgz#d173ea0524a691d4c0b1181752f2b46724328cdf"
integrity sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==

prettier@^1.7.0:
version "1.19.1"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
Expand Down
Loading