Fix git branch logging and egs_home vs HEN_HOUSE code comparisons #898
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rtownson
requested review from
ftessier,
mainegra and
blakewalters
and removed request for
a team
rtownson
force-pushed
the
fix-git-branch-logging
branch
from
4e081f9
to
d02635a
Compare
blakewalters
approved these changes
Jul 15, 2022
mainegra
approved these changes
Jul 18, 2022
|
@rtownson perhaps we can remove the git branch name altogether, and only keep the git commit hash? The branch name may cause confusion in fact, since it is a label that can point to any commit. What do you think? |
|
@ftessier sure, I see your point. It should always be paired with a commit to avoid confusion, but the potential issue with long branch names might not be worth keeping it around. |
|
@rtownson something like this, to remove all instances of |
ftessier
approved these changes
Jul 22, 2022
Remove the git branch information and provide the commit hash only. The branch name is just a label that can point to any commit, so it remains equivocal. This also solves the issue with long branch names where the fortran code would fail to compile because of exceeding the line length. Also, fix the comparisons between egs_home and HEN_HOUSE/user_code apps, so that it doesn't report a difference when the HEN_HOUSE version doesn't exist.
ftessier
force-pushed
the
fix-git-branch-logging
branch
from
c921e00
to
5d384d6
Compare
|
Rebased on develop and squashed. |
rtownson
added a commit
that referenced
this pull request
Aug 22, 2022
Fix compilation failure of BEAMnrc accelerators since the addition of git and compile time logging. This also adds back printing of the git hash, which was mistakenly removed in PR #898.
ftessier
pushed a commit
that referenced
this pull request
Oct 31, 2022
Fix compilation failure of BEAMnrc accelerators since the addition of git and compile time logging. This also adds back printing of the git hash, which was mistakenly removed in PR #898. Fix this for the compilation of the shared library as well. Also, add newline at end of beamnrc.spec.
ftessier
pushed a commit
that referenced
this pull request
Oct 31, 2022
Fix compilation failure of BEAMnrc accelerators since the addition of git and compile time logging. This also adds back printing of the git hash, which was mistakenly removed in PR #898. Fix this for the compilation of the shared library as well.
ftessier
pushed a commit
that referenced
this pull request
Oct 31, 2022
Fix compilation failure of BEAMnrc accelerators since the addition of git and compile time logging. This also adds back printing of the git hash, which was mistakenly removed in PR #898. Fix this for the compilation of the shared library as well.
rtownson
added a commit
that referenced
this pull request
Jan 12, 2023
Fix compilation failure of BEAMnrc accelerators since the addition of git and compile time logging. This also adds back printing of the git hash, which was mistakenly removed in PR #898. Fix this for the compilation of the shared library as well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix an issue with long branch names where the fortran code would fail to compile because of exceeding the line length. This isn't completely fixed, but now a few more characters are allowed before it crashes. Correct me if I'm wrong, but I think it's not possible to fix completely, because it seems like the DEFINE replacement means that we can't use mortrans usual automatic line wrapping.
Fix the comparisons between egs_home and HEN_HOUSE/user_code applications, so that it doesn't report a difference when the HEN_HOUSE version doesn't exist to start with.
This fixes minor issues introduced in PR #414.