Skip to content
This repository was archived by the owner on Jan 18, 2021. It is now read-only.

Commit bbbd06b

Browse files
[SHIPKIT-513] Setting new message
1 parent cebc216 commit bbbd06b

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/release/TravisPlugin.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.gradle.api.logging.Logger;
66
import org.gradle.api.logging.Logging;
77
import org.shipkit.gradle.configuration.ShipkitConfiguration;
8+
import org.shipkit.gradle.git.GitCommitTask;
89
import org.shipkit.gradle.git.IdentifyGitBranchTask;
910
import org.shipkit.gradle.release.ReleaseNeededTask;
1011
import org.shipkit.internal.gradle.configuration.BasicValidator;
@@ -16,6 +17,7 @@
1617
import org.shipkit.internal.gradle.util.StringUtil;
1718

1819
import static org.shipkit.internal.gradle.travis.TravisUtils.generateCommitMessage;
20+
import static org.shipkit.internal.gradle.travis.TravisUtils.generateCommitMessagePostfix;
1921

2022
/**
2123
* Configures the release automation to be used with Travis CI.
@@ -74,6 +76,10 @@ public void apply(final Project project) {
7476
t.setCommitMessage(generateCommitMessage(conf, travisCommitMessage, travisBuildNumber));
7577
t.setPullRequest(isPullRequest);
7678
});
79+
80+
project.getTasks().withType(GitCommitTask.class, t -> {
81+
t.setCommitMessagePostfix(generateCommitMessagePostfix(conf, travisCommitMessage, travisBuildNumber));
82+
});
7783
}
7884

7985
}

subprojects/shipkit/src/main/groovy/org/shipkit/internal/gradle/travis/TravisUtils.java

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@ public static String generateCommitMessage(ShipkitConfiguration conf, String tra
1919
}
2020
}
2121

22+
public static String generateCommitMessagePostfix(ShipkitConfiguration conf, String travisCommitMessage, String travisBuildNumber) {
23+
if (travisCommitMessage == null) {
24+
return null;
25+
}
26+
String travisJobUrl = generateTravisBuildUrl(conf, travisBuildNumber);
27+
28+
return "CI job: " + travisJobUrl + " [ci skip]";
29+
30+
}
31+
2232
private static String generateTravisBuildUrl(ShipkitConfiguration conf, String travisBuildNumber) {
2333
return String.format(URL_PATTERN, conf.getGitHub().getRepository(), travisBuildNumber);
2434
}

0 commit comments

Comments
 (0)