Skip to content

Commit 92aa2c5

Browse files
committed
[CI] Move closeOssrhStagingRepository to root project
1 parent dabe0a8 commit 92aa2c5

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
OSSRH_TOKEN_USERNAME: ${{ secrets.OSSRH_S01_TOKEN_USERNAME }}
120120
OSSRH_TOKEN_PASSWORD: ${{ secrets.OSSRH_S01_TOKEN_PASSWORD }}
121121
run: |
122-
./gradlew publishArtifacts \
122+
./gradlew publishArtifacts finalizeDeployArtifacts \
123123
--stacktrace \
124124
-PossrhUsername="$OSSRH_TOKEN_USERNAME" -PossrhPassword="$OSSRH_TOKEN_PASSWORD" \
125125
-PartifactoryUsername="$ARTIFACTORY_USERNAME" -PartifactoryPassword="$ARTIFACTORY_PASSWORD"

buildSrc/src/main/java/org/springframework/pulsar/gradle/RootProjectPlugin.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ public void apply(final Project project) {
4040
pluginManager.apply(ArtifactoryPlugin.class);
4141
pluginManager.apply(SonarQubeConventionsPlugin.class);
4242
project.getRepositories().mavenCentral();
43+
44+
Task finalizeDeployArtifacts = project.task("finalizeDeployArtifacts");
45+
if (ProjectUtils.isRelease(project) && project.hasProperty("ossrhUsername")) {
46+
finalizeDeployArtifacts.dependsOn(project.getTasks().findByName("closeOssrhStagingRepository"));
47+
}
4348
}
4449

4550
}

buildSrc/src/main/java/org/springframework/pulsar/gradle/publish/PublishArtifactsPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public void apply(Project project) {
1313
publishArtifacts.setGroup("Publishing");
1414
publishArtifacts.setDescription("Publish the artifacts to either Artifactory or Maven Central based on the version");
1515
if (ProjectUtils.isRelease(project)) {
16-
publishArtifacts.dependsOn("publishToOssrh", "closeOssrhStagingRepository");
16+
publishArtifacts.dependsOn("publishToOssrh");
1717
}
1818
else {
1919
publishArtifacts.dependsOn("artifactoryPublish");

0 commit comments

Comments
 (0)