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

Remove cmake code that breaks pre-commit on Windows #36562

Merged
merged 1 commit into from
Dec 15, 2023

Conversation

jclarkeSTFC
Copy link
Contributor

The code deleted here copied the contents of .git/hooks/pre-commit to a new file called pre-commit-script.py, then changed pre-commit to run pre-commit-script.py with python. But now the contents of pre-commit is bash, not python, so don't do any of this copying any more.

Fixes #36554.

To test:

Best to make sure your environment is up to date. On Windows you need to run cmake to make sure your files in .git/hooks/ are updated to the broken version. You should then be able to commit with no problems.

This does not require release notes because it's not relevant to the user.


Reviewer

Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.

Code Review

  • Is the code of an acceptable quality?
  • Does the code conform to the coding standards?
  • Are the unit tests small and test the class in isolation?
  • If there is GUI work does it follow the GUI standards?
  • If there are changes in the release notes then do they describe the changes appropriately?
  • Do the release notes conform to the release notes guide?

Functional Tests

  • Do changes function as described? Add comments below that describe the tests performed?
  • Do the changes handle unexpected situations, e.g. bad input?
  • Has the relevant (user and developer) documentation been added/updated?

Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will take care of it.

Gatekeeper

If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.

This code copied the contents of ``.git/hooks/pre-commit`` to a new file
called ``pre-commit-script.py``, then changed ``pre-commit`` to run
``pre-commit-script.py`` with python. But now the contents of ``pre-commit``
is bash, not python, so don't do any of this copying any more.
@jclarkeSTFC jclarkeSTFC added High Priority An issue or pull request that if not addressed is severe enough to postponse a release. Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) ISIS Team: Core Issue and pull requests managed by the Core subteam at ISIS Windows Only Only on Windows labels Dec 14, 2023
@jclarkeSTFC jclarkeSTFC added this to the Release 6.9 milestone Dec 14, 2023
@jclarkeSTFC jclarkeSTFC marked this pull request as ready for review December 14, 2023 17:11
@MialLewis MialLewis self-assigned this Dec 15, 2023
Copy link
Contributor

@MialLewis MialLewis left a comment

Choose a reason for hiding this comment

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

Fix works. thanks.

@sf1919 sf1919 merged commit df1af61 into main Dec 15, 2023
9 checks passed
@sf1919 sf1919 deleted the 36554_fix_pre_commit_win branch December 15, 2023 09:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Issues and pull requests that are regressions or would be considered a bug by users (e.g. crashing) High Priority An issue or pull request that if not addressed is severe enough to postponse a release. ISIS Team: Core Issue and pull requests managed by the Core subteam at ISIS Windows Only Only on Windows
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pre-commit broken on Windows
3 participants