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

#1692: do not error in build if git folder is not available #1693

Merged
merged 3 commits into from
Mar 3, 2022

Conversation

nmm0
Copy link
Collaborator

@nmm0 nmm0 commented Mar 3, 2022

Fixes #1692

nmm0 added 3 commits March 3, 2022 09:55
…actually used; a copy in the src folder is used instead
…(the VERSION file). This also allows us to print out the version in the banner, which is useful if not git info is available
@nmm0 nmm0 requested review from PhilMiller, lifflander and cz4rs March 3, 2022 17:58

file(READ "VERSION" _vt_version_str)
string(STRIP "${_vt_version_str}" _vt_version_str)
project(vt VERSION ${_vt_version_str})
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version number changes should only be done in the VERSION file now

set(VERSION_PATCH "0")
set(VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
set(VERSION_MINOR "${PROJECT_VERSION_MINOR}")
set(VERSION_PATCH "${PROJECT_VERSION_PATCH}")
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not directly related to the PR but I thought I might as well do it with the versioning consistency, but these will now read from the cmake file

fmt::print("{}{}{}", vt_pre, f6, reset);
fmt::print("{}{}{}", vt_pre, f7, reset);
auto vt_version_string = fmt::format("{}.{}.{}", vt_version_major, vt_version_minor, vt_version_patch);
std::array< std::string, 11 > info_lines = {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made it easier to add lines to the banner. When we eventually switch to C++17, we won't need to give the number of lines to std::array, it will be able to use CTAD to deduce

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (gcc-6, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (clang-5.0, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (clang-3.9, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (gcc-5, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (gcc-9, ubuntu, mpich, zoltan)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (gcc-10, ubuntu, openmpi, no LB)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@nmm0 nmm0 changed the title do not error in build if git folder is not available #1692: do not error in build if git folder is not available Mar 3, 2022
@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (gcc-8, ubuntu, mpich, address sanitizer)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (nvidia cuda 10.1, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (clang-9, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (clang-10, alpine, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (nvidia cuda 11.0, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (clang-10, ubuntu, mpich)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

Copy link
Contributor

@cz4rs cz4rs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@github-actions
Copy link

github-actions bot commented Mar 3, 2022

PR tests (gcc-7, ubuntu, mpich, trace runtime, LB)

Build for 144de3b

Compilation - successful

Testing - passed

Build log

@lifflander lifflander merged commit e906fc0 into develop Mar 3, 2022
cz4rs pushed a commit that referenced this pull request Mar 4, 2022
#1692: do not error in build if git folder is not available
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 this pull request may close these issues.

Make git repository not required for build
3 participants