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

Reduce duplicate jenkins buildsteps #39056

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

peterfpeterson
Copy link
Member

Jenkins was running the steps to download data more than once for jobs with docs and unit tests. This also defers to ninja how many threads to use.

There is no associated issue.

To test:

If the builds pass, this was a reasonable refactor. Otherwise looking at how the main if/else was combined and looking at a linux job logs will help see if the changes are correct.

This does not require release notes because it is a change to the buildserver.


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.

@peterfpeterson peterfpeterson added the Maintenance Unassigned issues to be addressed in the next maintenance period. label Mar 13, 2025
@peterfpeterson peterfpeterson added this to the Release 6.13 milestone Mar 13, 2025
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.

A couple of queries.

Haven't managed to look at jenkins output yet as it's currently operating at a glacial pace.

@@ -44,6 +44,12 @@ cmake --preset=${CMAKE_PRESET} ${MANTID_DATA_STORE_CMAKE} ${EXTRA_CMAKE_FLAGS} $
# Run the actual builds for the code, unit tests, and system tests.
cd $WORKSPACE/build

# if using ninja let ninja control compiling threads
if [ -f build.ninja ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it would make sense to combine this into an if/else statement with line 36-39?

In this implementation the fact we don't use ninja on windows is inferred as we disregard line 38 if using ninja. We may as well make this explicit?

Copy link
Member Author

Choose a reason for hiding this comment

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

I could add a comment to that effect. I like to keep the platform and the tools as separate things in case the tool becomes more platform generic.

This comes from long ago when pre-processor macros in the code assumed clang==osx which made it really hard when people started testing out clang on linux.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Maintenance Unassigned issues to be addressed in the next maintenance period.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants