Update develop with last minute changes made to master
#264
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change cpp-linters job to run only for: - merges to develop, and - pull requests to develop. Remove cpp-linters job from Test workflow.
If we expect some of our PRs to have a large diff, then we should disable any features that rely on having diff information: - lines-changed-only, - files-changed-only, - format-review, and - tidy-review. For a more detailed explanation: cpp-linter/cpp-linter-action#274 (comment)
rturrado
changed the title
developwith last minute changes made to masterdevelop with last minute changes made to master
elenbaasc
approved these changes
Oct 18, 2024
rturrado
deleted the
update-develop-with-last-minute-changes-made-to-master
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Due to an issue with the
cpp-linter-action, we had to do some last minute changes inmaster:This PR is updating
developwith those last minute changes frommaster.It also adds an extra change:
files-changed-onlyandformat-reviewlinter options (thus using theirfalsedefault value).Explanation: if we expect some of our PRs to have a large diff, then we should disable any features that rely on having diff information:
lines-changed-only,files-changed-only,format-review, andtidy-review.For a more detailed explanation: cpp-linter/cpp-linter-action#274 (comment)