[ADAM-1322] Skip git commit plugin if .git is missing. #1323

Merged
merged 1 commit into from Dec 28, 2016

Conversation

Projects
3 participants
@fnothaft
Member

fnothaft commented Dec 22, 2016

Resolves #1322.

@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Dec 22, 2016

Member

Hold on merging; going to build and test locally.

Member

fnothaft commented Dec 22, 2016

Hold on merging; going to build and test locally.

@AmplabJenkins

This comment has been minimized.

Show comment
Hide comment
@AmplabJenkins

AmplabJenkins Dec 22, 2016

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/ADAM-prb/1690/
Test PASSed.

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
https://amplab.cs.berkeley.edu/jenkins//job/ADAM-prb/1690/
Test PASSed.

@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Dec 22, 2016

Member

This is good to go. If you build without a .git directory, you get:

./bin/adam-submit --version
Using ADAM_MAIN=org.bdgenomics.adam.cli.ADAMMain
Using SPARK_SUBMIT=/usr/local/bin/spark-1.5.2//bin/spark-submit

       e         888~-_          e             e    e
      d8b        888   \        d8b           d8b  d8b
     /Y88b       888    |      /Y88b         d888bdY88b
    /  Y88b      888    |     /  Y88b       / Y88Y Y888b
   /____Y88b     888   /     /____Y88b     /   YY   Y888b
  /      Y88b    888_-~     /      Y88b   /          Y888b

ADAM version: 0.20.1-SNAPSHOT
Commit: ${git.commit.id} Build: 2016-12-22
Built for: Scala 2.10.6 and Hadoop 2.7.3
Member

fnothaft commented Dec 22, 2016

This is good to go. If you build without a .git directory, you get:

./bin/adam-submit --version
Using ADAM_MAIN=org.bdgenomics.adam.cli.ADAMMain
Using SPARK_SUBMIT=/usr/local/bin/spark-1.5.2//bin/spark-submit

       e         888~-_          e             e    e
      d8b        888   \        d8b           d8b  d8b
     /Y88b       888    |      /Y88b         d888bdY88b
    /  Y88b      888    |     /  Y88b       / Y88Y Y888b
   /____Y88b     888   /     /____Y88b     /   YY   Y888b
  /      Y88b    888_-~     /      Y88b   /          Y888b

ADAM version: 0.20.1-SNAPSHOT
Commit: ${git.commit.id} Build: 2016-12-22
Built for: Scala 2.10.6 and Hadoop 2.7.3

@fnothaft fnothaft added this to the 0.21.0 milestone Dec 22, 2016

@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Dec 23, 2016

Member

Ping for review/merge.

Member

fnothaft commented Dec 23, 2016

Ping for review/merge.

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Dec 23, 2016

Member

Sure, will give it a test this evening when I'm not so distracted.

Member

heuermh commented Dec 23, 2016

Sure, will give it a test this evening when I'm not so distracted.

@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Dec 23, 2016

Member

Sounds good, thanks.

Member

fnothaft commented Dec 23, 2016

Sounds good, thanks.

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Dec 28, 2016

Member

This works for me.

I want to modify About/ADAMMain so that if the commit template variable hasn't been set that the Commit: ... line isn't displayed, will send a PR later today.

Member

heuermh commented Dec 28, 2016

This works for me.

I want to modify About/ADAMMain so that if the commit template variable hasn't been set that the Commit: ... line isn't displayed, will send a PR later today.

@fnothaft

This comment has been minimized.

Show comment
Hide comment
@fnothaft

fnothaft Dec 28, 2016

Member

I want to modify About/ADAMMain so that if the commit template variable hasn't been set that the Commit: ... line isn't displayed, will send a PR later today.

Good call; will look out for the PR.

Member

fnothaft commented Dec 28, 2016

I want to modify About/ADAMMain so that if the commit template variable hasn't been set that the Commit: ... line isn't displayed, will send a PR later today.

Good call; will look out for the PR.

@heuermh

This comment has been minimized.

Show comment
Hide comment
@heuermh

heuermh Dec 28, 2016

Member

Sorry, I'm an idiot, there's already

if (about.isSnapshot) { ...
Member

heuermh commented Dec 28, 2016

Sorry, I'm an idiot, there's already

if (about.isSnapshot) { ...

@heuermh heuermh merged commit 8f6016b into bigdatagenomics:master Dec 28, 2016

1 check passed

default Merged build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment