Skip to content

[CI] Use git diff instead of git status #2687

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

Merged
merged 1 commit into from
Apr 11, 2025
Merged

[CI] Use git diff instead of git status #2687

merged 1 commit into from
Apr 11, 2025

Conversation

smnandre
Copy link
Member

@smnandre smnandre commented Apr 9, 2025

The CI often fails on the "check dist files" script because some dist file changed .. with no real content change

This PR replace the git status --porcelain with a git diff --quiet to ignore this situation.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
The check failed here because file changed .. but with no content change.
@carsonbot carsonbot added the Status: Needs Review Needs to be reviewed label Apr 9, 2025
@smnandre smnandre requested a review from Kocal April 9, 2025 23:41
@Kocal
Copy link
Member

Kocal commented Apr 10, 2025

The CI often fails on the "check dist files" script because some dist file changed .. with no real content change

Do you have a link to a failed job? I would like to understand what you call "with no real content change", thanks 🙏🏻

@smnandre
Copy link
Member Author

https://github.com/symfony/ux/actions/runs/14356670896/job/40247624603?pr=2663

@Kocal
Copy link
Member

Kocal commented Apr 11, 2025

Mmmh, why not, in #2663 it happens because lines 4 to 29 have CRLF instead of LF chars we expect (or vice-versa).

Let's merge it, but I will open a new PR to enforce LF chars for text files

@carsonbot carsonbot added Status: Reviewed Has been reviewed by a maintainer and removed Status: Needs Review Needs to be reviewed labels Apr 11, 2025
@Kocal
Copy link
Member

Kocal commented Apr 11, 2025

Thanks Simon.

@Kocal Kocal merged commit 484575d into 2.x Apr 11, 2025
152 of 157 checks passed
Kocal added a commit that referenced this pull request Apr 13, 2025

Verified

This commit was signed with the committer’s verified signature.
Kocal Hugo Alliaume
This PR was merged into the 2.x branch.

Discussion
----------

Add .editorconfig, enforce LF line-ending style

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no <!-- please update src/**/CHANGELOG.md files -->
| Docs?         | no <!-- required for new features -->
| Issues        | Fix #... <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->
| License       | MIT

<!--
Replace this notice by a description of your feature/bugfix.
This will help reviewers and should be a good start for the documentation.

Additionally (see https://symfony.com/releases):
 - Always add tests and ensure they pass.
 - For new features, provide some code snippets to help understand usage.
 - Features and deprecations must be submitted against branch main.
 - Update/add documentation as required (we can help!)
 - Changelog entry should follow https://symfony.com/doc/current/contributing/code/conventions.html#writing-a-changelog-entry
 - Never break backward compatibility (see https://symfony.com/bc).
-->

Following #2687

Commits
-------

aafa87b Add .editorconfig, enforce LF line-ending style
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Status: Reviewed Has been reviewed by a maintainer
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants