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

Jump to bottom

Align astyle flags in Makefile with CI #4277

Merged
merged 2 commits into from
Jan 28, 2024
Merged

Align astyle flags in Makefile with CI #4277

merged 2 commits into from
Jan 28, 2024

Conversation

serge-s
Copy link
Contributor

@serge-s serge-s commented Jan 28, 2024

Remove unsupported --squeeze-lines=2 parameter

Fixes #4275

@serge-s
Align astyle flags in Makefile with CI
6d0bb2a 
Remove unsupported `--squeeze-lines=2` parameter

Fixes nlohmann#4275
@github-actions github-actions bot added the S label Jan 28, 2024
@coveralls
Copy link

coveralls commented Jan 28, 2024 •
edited
Loading

Coverage Status

coverage: 100.0%. remained the same
when pulling 3235af0 on serge-s:fix_make_amalgamate
into c35d260 on nlohmann:develop.

@nlohmann
Copy link
Owner

Please update the latest develop branch which fixes clang-tidy.

@serge-s serge-s marked this pull request as ready for review January 28, 2024 15:17
nlohmann
nlohmann approved these changes Jan 28, 2024
View reviewed changes
Copy link
Owner

@nlohmann nlohmann left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@nlohmann nlohmann added this to the Release 3.11.4 milestone Jan 28, 2024
@nlohmann nlohmann merged commit 0457de2 into nlohmann:develop Jan 28, 2024
111 checks passed
@nlohmann
Copy link
Owner

Thanks!

@serge-s serge-s deleted the fix_make_amalgamate branch January 29, 2024 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nlohmann nlohmann nlohmann approved these changes

Assignees
No one assigned
Labels
S
Projects
None yet
Milestone
Release 3.11.4
Development

Successfully merging this pull request may close these issues.

Can't run make amalgamate
3 participants
@serge-s @coveralls @nlohmann