Skip to content

Conversation

@mwheinz
Copy link

@mwheinz mwheinz commented Apr 29, 2019

Refs #6614

make-authors.pl checks that .git exists and is a directory before
getting the git log - but when a repo is checked out as a submodule of a
larger repository, .git is not a directory, it's just a text file. This
can cause make-authors.pl to terminate inappropriately.

Author: Michael Heinz [email protected]
Signed-off-by: Michael Heinz [email protected]
(cherry picked from commit 0a8fa54)

make-authors.pl checks that .git exists and is a directory before
getting the git log - but when a repo is checked out as a submodule of a
larger repository, .git is not a directory, it's just a text file.  This
can cause make-authors.pl to terminate inappropriately.

Author: Michael Heinz <[email protected]>
Signed-off-by: Michael Heinz <[email protected]>
(cherry picked from commit 0a8fa54)
@ibm-ompi
Copy link

The IBM CI (XL Compiler) build failed! Please review the log, linked below.

Gist: https://gist.github.com/ibm-ompi/88b480fb98dfd2bdac939f023e1f8fe6

@jsquyres jsquyres changed the title make-authors.pl script not compatible with being a submodule. v3.1: make-authors.pl script not compatible with being a submodule. Apr 29, 2019
@jsquyres jsquyres added this to the v3.1.5 milestone Apr 29, 2019
@mwheinz
Copy link
Author

mwheinz commented Apr 29, 2019

The IBM CI (XL Compiler) build failed! Please review the log, linked below.

Gist: https://gist.github.com/ibm-ompi/88b480fb98dfd2bdac939f023e1f8fe6

I'm not sure what to do with this - the link takes me to a default landing page rather than a build log?

@gpaulsen - can you offer any suggestions?

@jjhursey
Copy link
Member

bot:ibm:xl:retest (it looks like a network issue in the lab - let's try again.)

@open-mpi open-mpi deleted a comment from ibm-ompi Apr 29, 2019
@jjhursey
Copy link
Member

bot:ibm:xl:retest

@jjhursey
Copy link
Member

The IBM XL CI keeps tripping on a network issue. Given the scope of this PR and that the other IBM CI has passed, I'm ok with merging it in even if the IBM XL CI is marked as failed. I'll keep monitoring the CI machine to try to resolve the network issue. Sorry about that.

@open-mpi open-mpi deleted a comment from ibm-ompi Apr 29, 2019
@jjhursey
Copy link
Member

bot:ibm:xl:retest

@jsquyres jsquyres merged commit c0d1215 into open-mpi:v3.1.x Apr 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants