search

SyneRBI / SIRF-SuperBuild

SIRF CMake SuperBuild
http://www.ccpsynerbi.ac.uk
Apache License 2.0
15 stars 18 forks source link

Cannot build Date #864

Closed KrisThielemans closed 7 months ago

KrisThielemans commented 7 months ago

I get the following on CentOS. 

[ 51%] Creating directories for 'Date'
[ 52%] Performing download step (git clone) for 'Date'
Cloning into 'Date'...
Already on 'master'
[ 53%] Performing update step for 'Date'
warning: CRLF will be replaced by LF in test/tz_test/tzdata2015e.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2015f.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016c.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016d.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016e.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016f.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2015e.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2015f.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016c.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016d.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016e.txt.zip.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in test/tz_test/tzdata2016f.txt.zip.
The file will have its original line endings in your working directory.
No rebase in progress?
error: Your local changes to the following files would be overwritten by merge:
    test/tz_test/tzdata2015e.txt.zip
    test/tz_test/tzdata2015f.txt.zip
    test/tz_test/tzdata2016c.txt.zip
    test/tz_test/tzdata2016d.txt.zip
    test/tz_test/tzdata2016e.txt.zip
    test/tz_test/tzdata2016f.txt.zip
Please, commit your changes or stash them before you can merge.
Aborting
Index was not unstashed.
CMake Error at /SAN/inm/tools/build_cluster/SIRF-SuperBuild/Release-cuda12.0/builds/Date/tmp/Date-gitupdate.cmake:203 (message):

  Failed to rebase in:
  '/SAN/inm/tools/build_cluster/SIRF-SuperBuild/Release-cuda12.0/sources/Date'.
  Output from the attempted rebase follows:
  Cannot rebase: You have unstaged changes.
  Please commit or stash them.
  You will have to resolve the conflicts manually

make[2]: *** [CMakeFiles/Date.dir/build.make:119: builds/Date/stamp/Date-update] Error 1

Probably missing .gitattributes. I have no idea if this is a new or old bug, as we are on master apparently. https://github.com/SyneRBI/SIRF-SuperBuild/blob/bec271e5f23252a6aee1231a0d165d7e03b8f1d3/version_config.cmake#L186C22-L187