search

mangerij / ferret

Open-source MOOSE application "Ferret" for parallel mesoscale simulations of ferroic and related electronic materials
7 stars 6 forks source link

merge in changes from inl #329

Closed mangerij closed 8 months ago

mangerij commented 8 months ago

closes #328, refers to some parser changes https://github.com/idaholab/moose/pull/25994

thanks @MengnanLi91

mangerij commented 8 months ago

@cticenhour this is new, I try to merge in something from devel to the master and it has to pass some sort of precheck?

This is how things were a longggg time ago but I was under the impression that the CI was not currently "two ways" (i.e. changes to Ferret would have to pass Ferret's tests etc).

I can go ahead and merge it... just want to make sure if any procedure changed.

cticenhour commented 8 months ago

No, we've had the same procedure for some time. This failure is expected based on the precheck settings. Its standard is based on the following workflow:

PR submission to devel --> merge to devel with CI testing --> moosebuild automatic merge to master when all testing passes.

By manually doing the merge from devel to master, as in this PR, precheck will always fail. If you want CIVET to perform the merge for you, we just need to make some adjustments to CIVET and Ferret.

mangerij commented 8 months ago

@cticenhour no no this is fine!

I merge in the changes @MengnanLi91 thanks!