Uploaded image for project: 'HPCC'
  1. HPCC
  2. HPCC-25737

Smoketest action fails when new file add into the repository with PR

    XMLWordPrintable

Details

    • Bug
    • Status: Resolved
    • Major
    • Resolution: Fixed
    • 7.12.x
    • 7.12.48, 8.0.8
    • Build process
    • None
    • GitHub

    Description

      When a PR adds new files like PR-14857 (HPCC-25735) to the repository the Smoketest Actions fails.

      The error message from the "Cache hit prep" step is:

      119.Applying merge patch
      120../merge-patch:132: trailing whitespace.
      121    import teststd.Math as testMod;    
      122warning: 1 line adds whitespace errors.
      123[detached HEAD 3de37e90c] merge-patch
      124 4 files changed, 7 insertions(+), 7 deletions(-)
      125Cached source tree files:
      126./system/aws/aws-sdk-cpp/aws-cpp-sdk-core/include/aws/core/SDKConfig.h
      127./plugins/couchbase/libcouchbase/tests/CouchbaseMock.jar
      128./plugins/couchbase/libcouchbase/packaging/distinfo/distinfo.cmake
      129================
      1307518 blocks
      131error: The following untracked working tree files would be overwritten by checkout:
      132	testing/regress/ecl/key/teststdlibrary2.xml
      133	testing/regress/ecl/teststdlibrary2.ecl
      134Please move or remove them before you switch branches.
      135Aborting
      136Error: Process completed with exit code 1. 

       

      One possible solution is to use 'git add .' like this:

        git checkout $(cat ../build/cache-sha)
        git submodule update --init --recursive --jobs 4
        echo "Applying merge patch"
        git apply ../merge-patch
        git add .                     # Add new files before commit
        git -c user.name='Smoketest' -c user.email='smoke@test.com' commit -a -m 'merge-patch'

      Attachments

        Issue Links

          Activity

            People

              jakesmith Jake Smith
              attilavamos Attila Vamos
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

              Dates

                Created:
                Updated:
                Resolved: