From 7c4682f8160fb08874834e7023879f91ae13de14 Mon Sep 17 00:00:00 2001 From: Jeremiah Zucker Date: Sat, 5 Mar 2022 14:25:53 -0500 Subject: [PATCH] fix test and await on publishing --- plugins/gradle/__tests__/gradle.test.ts | 2 +- plugins/gradle/src/index.ts | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/plugins/gradle/__tests__/gradle.test.ts b/plugins/gradle/__tests__/gradle.test.ts index e031a376b..ec22d1b41 100644 --- a/plugins/gradle/__tests__/gradle.test.ts +++ b/plugins/gradle/__tests__/gradle.test.ts @@ -215,7 +215,7 @@ describe("Gradle Plugin", () => { const spy = jest.fn(); exec.mockReturnValueOnce(properties).mockImplementation(spy); - await hooks.canary.promise({ bump: Auto.SEMVER.patch, canaryIdentifier: "canary123" }); + await hooks.canary.promise({ bump: Auto.SEMVER.patch, canaryIdentifier: "-canary123" }); expect(spy).toHaveBeenCalledWith(expect.stringMatching("gradle"), [ "updateVersion", diff --git a/plugins/gradle/src/index.ts b/plugins/gradle/src/index.ts index ec183d239..f51c7aa6d 100644 --- a/plugins/gradle/src/index.ts +++ b/plugins/gradle/src/index.ts @@ -144,6 +144,7 @@ export default class GradleReleasePluginPlugin implements IPlugin { /** Tap into auto plugin points. */ apply(auto: Auto) { + /** Call gradle publish, if exists, otherwise log warning */ const publish = async () => { const { publish } = this.properties; @@ -242,7 +243,7 @@ export default class GradleReleasePluginPlugin implements IPlugin { ); auto.hooks.publish.tapPromise(this.name, async () => { - publish(); + await publish(); await execPromise("git", [ "push", @@ -276,7 +277,7 @@ export default class GradleReleasePluginPlugin implements IPlugin { false ); - publish(); + await publish(); return canaryVersion; } @@ -330,7 +331,7 @@ export default class GradleReleasePluginPlugin implements IPlugin { false ); - publish(); + await publish(); return preReleaseVersions; }