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.

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

[core] Fix failing CI steps #41636

Merged
merged 4 commits into from
Mar 25, 2024
Merged

[core] Fix failing CI steps #41636

merged 4 commits into from
Mar 25, 2024

Conversation

mnajdova
Copy link
Member

@mnajdova mnajdova added the core Infrastructure work going on behind the scenes label Mar 25, 2024
@mui-bot
Copy link

mui-bot commented Mar 25, 2024

Netlify deploy preview

https://deploy-preview-41636--material-ui.netlify.app/

Bundle size report

No bundle size changes (Toolpad)
No bundle size changes

Generated by 🚫 dangerJS against 73498f2

@mnajdova mnajdova changed the title [core] Fix failing CI [core] Commit prettier changes Mar 25, 2024
@mnajdova mnajdova changed the title [core] Commit prettier changes [core] Fix failing CI steps Mar 25, 2024
@mnajdova mnajdova marked this pull request as ready for review March 25, 2024 10:19
Copy link
Contributor

@brijeshb42 brijeshb42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a minor question.

docs/mui-vale/styles/MUI/MuiBrandName.yml Outdated Show resolved Hide resolved
Signed-off-by: Marija Najdova <mnajdova@gmail.com>
Co-authored-by: Brijesh Bittu <brijeshb42@gmail.com>
Signed-off-by: Marija Najdova <mnajdova@gmail.com>
@Janpot
Copy link
Member

Janpot commented Mar 25, 2024

https://app.circleci.com/pipelines/github/mui/material-ui/125013/workflows/46ad0ce4-95a6-41a3-996b-46cc44e9ca7e/jobs/674181/parallel-runs/0/steps/0-105
Yep, it's not checking any files anymore for some reason. Seems to have started happening around this PR. There doesn't seem to be anything inside that can explain this. Is it around this time that the default branch has changed?

Can you try to change the command to

diff --git a/package.json b/package.json
index f615b64c09..134f118c85 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "stylelint": "stylelint --reportInvalidScopeDisables --reportNeedlessDisables \"docs/**/*.{js,ts,tsx}\"",
     "markdownlint": "markdownlint-cli2 \"**/*.md\"",
     "valelint": "git ls-files | grep -h \".md$\" | xargs vale --filter='.Level==\"error\"'",
-    "prettier": "pretty-quick --ignore-path .eslintignore",
+    "prettier": "pretty-quick --ignore-path .eslintignore --branch master",
     "prettier:all": "prettier --write . --ignore-path .eslintignore",
     "size:snapshot": "node --max-old-space-size=4096 ./scripts/sizeSnapshot/create",
     "size:why": "pnpm size:snapshot --analyze",

@mnajdova
Copy link
Member Author

mnajdova commented Mar 25, 2024

@Janpot should the branch option be next actually? I think this may be the problem. Let me open a PR with just this change.

Edit: I changed the next branch to be default right before that PR, that is likely the reason. Using both the master and the the next branch passed in #41637

@Janpot
Copy link
Member

Janpot commented Mar 25, 2024

should the branch option be next actually?

Yes, I was trying back and forth locally between master and next and diffed the wrong change 🤦. --branch next is what I meant.

@mnajdova
Copy link
Member Author

Yes, I was trying back and forth locally between master and next and diffed the wrong change 🤦. --branch next is what I meant.

But even that doesn't fail #41637, probably we need to do something else as well.

Note, on this PR, I also pushed some changes I got when running pnpm install, I wonder why those weren't picked up either. cc @michaldudak maybe you can shed some light :)

@brijeshb42
Copy link
Contributor

Do we need to modify this line to use next instead of master?

@Janpot
Copy link
Member

Janpot commented Mar 25, 2024

Do we need to modify this line to use next instead of master?

Yes, I think so. Ideally we just add a global $BASE_BRANCH variable to centralize the logic

@mnajdova
Copy link
Member Author

mnajdova commented Mar 25, 2024

Do we need to modify this line to use next instead of master?

Good catch! I will push the changes in #41637 to validate if it works.

On #41637 pnpm run prettier does not create any changes, I suppose because it compared changes with next, but I am not sure? I tried to also break a file, but still pnpm run prettier does not changes it back. 😕

@mnajdova
Copy link
Member Author

I will merge this branch to unblock the release. Let's continue the discussion in #41637

@mnajdova mnajdova merged commit 9a84228 into mui:next Mar 25, 2024
22 checks passed
@michaldudak
Copy link
Member

Note, on this PR, I also pushed some changes I got when running pnpm install, I wonder why those weren't picked up either

@mnajdova This doesn't look right. It seems that Base UI was somehow downgraded from 5.0.0-beta.40 to 5.0.0-beta.30

@michaldudak
Copy link
Member

michaldudak commented Mar 25, 2024

The pnpm install --frozen-lockfile succeeds when pnpm install would update the lockfile. This looks like a bug in pnpm. I've created an issue: pnpm/pnpm#7823

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core Infrastructure work going on behind the scenes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants