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

Cannot build Date #864

Closed
KrisThielemans opened this issue Feb 21, 2024 · 0 comments · Fixed by #867
Closed

Cannot build Date #864

KrisThielemans opened this issue Feb 21, 2024 · 0 comments · Fixed by #867

Comments

@KrisThielemans
Copy link
Member

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

@KrisThielemans KrisThielemans changed the title Cannot build Data Cannot build Date Feb 22, 2024
KrisThielemans added a commit to KrisThielemans/SIRF-SuperBuild that referenced this issue Feb 22, 2024
KrisThielemans added a commit to KrisThielemans/SIRF-SuperBuild that referenced this issue Feb 22, 2024
KrisThielemans added a commit to KrisThielemans/SIRF-SuperBuild that referenced this issue Feb 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging a pull request may close this issue.

1 participant