BP test workflow stopped working
jphickey opened this issue · comments
Describe the bug
Github workflow does not successfully merge the iodriver patch as expected.
For example, see recent manual run that I attempted: https://github.com/nasa/bp/actions/runs/3969253764
To Reproduce
Just run the workflow
Expected behavior
Should pass
System observed on:
Github hosted runner
Additional context
This appears to be related to the checkout. When checking out in a workflow, it appears the script does a shallow clone, effectively only copying the HEAD version. However, in the BP workflow, it also needs to merge a patch for the iodriver module. This is a PSP module that facilitates passing data between two cFS instances.
In this case, the NASA PSP module received updates to its main branch since the script was originally written. Due to the shallow clone nature, it now sees the two histories as being unrelated, because there is no common ancestor. Although there is a common ancestor -- it just was not cloned into the work area.
Reporter Info
Joseph Hickey, Vantage Systems, Inc.
The original intent of the script - which is to merge the iodriver - would probably require an additional "fetch" from nasa/psp repo to fill in the history so the common ancestor can be found.
Alternatively, it may be simpler to use the techdev-iodriver branch directly, and only merge with NASA mainline when needed.