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

chore: move prettier step up to prevent empty PRs #5125

Open
wants to merge 2 commits into
base: main
Choose a base branch
from

Conversation

mikeromard
Copy link
Contributor

Pull Request Submission

Please check the boxes once done.

The pull request must:

  • Reviewer Documentation
    • follow CONTRIBUTING rules
    • be accompanied by a detailed description of the changes
    • contain a risk assessment of the change (Low | Medium | High) with regards to breaking existing functionality. A change e.g. of an underlying language plugin can completely break the functionality for that language, but appearing as only a version change in the dependencies.
    • highlight breaking API if applicable
    • contain a link to the automatic tests that cover the updated functionality.
    • contain testing instructions in case that the reviewer wants to manual verify as well, to add to the manual testing done by the author.
    • link to the link to the PR for the User-facing documentation
  • User facing Documentation
    • update any relevant documentation in gitbook by submitting a gitbook PR, and including the PR link here
    • ensure that the message of the final single commit is descriptive and prefixed with either feat: or fix: , others might be used in rare occasions as well, if there is no need to document the changes in the release notes. The changes or fixes should be described in detail in the commit message for the changelog & release notes.
  • Testing
    • Changes, removals and additions to functionality must be covered by acceptance / integration tests or smoke tests - either already existing ones, or new ones, created by the author of the PR.

Pull Request Review

All pull requests must undergo a thorough review process before being merged.
The review process of the code PR should include code review, testing, and any necessary feedback or revisions.
Pull request reviews of functionality developed in other teams only review the given documentation and test reports.

Manual testing will not be performed by the reviewing team, and is the responsibility of the author of the PR.

For Node projects: It’s important to make sure changes in package.json are also affecting package-lock.json correctly.

If a dependency is not necessary, don’t add it.

When adding a new package as a dependency, make sure that the change is absolutely necessary. We would like to refrain from adding new dependencies when possible.
Documentation PRs in gitbook are reviewed by Snyk's content team. They will also advise on the best phrasing and structuring if needed.

Pull Request Approval

Once a pull request has been reviewed and all necessary revisions have been made, it is approved for merging into
the main codebase. The merging of the code PR is performed by the code owners, the merging of the documentation PR
by our content writers.

What does this PR do?

This moves the prettier steps in the README sync workflow up so that they happen before the README file is copied over, and before the workflow checks to see if any files have been updated.

Prior to this PR, the workflow checked for files that had been changed before it ran the prettier command. That command has already been run for the README file that's in the main branch, so it found that the file was changed. Then it ran prettier, did a git push, and went on to open a PR, but since the difference in the file no longer existed at that point, that PR was empty. If the workflow runs prettier before it checks for changed files, it shouldn't detect any changes unless the content has actually been updated.

This PR also reenables the workflow schedule.

Where should the reviewer start?

How should this be manually tested?

You could test this manually by running the steps from the workflow on your laptop.

Any background context you want to provide?

What are the relevant tickets?

Screenshots

Additional questions

@mikeromard mikeromard marked this pull request as ready for review March 20, 2024 16:00
@mikeromard mikeromard requested a review from a team as a code owner March 20, 2024 16:00
# Replace the README.md content with the GitBook content
cp current_gitbook.md ./cli/README.md

# If changes, commit and create PR
if [[ $(git -C ./cli status --porcelain) ]]; then
echo "Documentation changes detected"
cd ./cli
npm clean-install
npx prettier --write README.md
git push -f -u origin $DESTINATION_BRANCH
Copy link
Contributor

Choose a reason for hiding this comment

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

Force pushing to a branch defined by a variable makes me really nervous, if $DESTINATION_BRANCH could be something like main. Maybe branch protection rules would prevent that (would they for actions though)?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for your feedback @cmars! The value for the variable is defined in this file on line 61, but is there some concern that it could be defined elsewhere and override the value specified in this file?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants