Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release Command: Tag creation fallback. #1929

Merged
merged 4 commits into from Mar 29, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 12 additions & 3 deletions packages/cli/src/parse-args.ts
Expand Up @@ -467,7 +467,11 @@ export const commands: AutoCommand[] = [
{
name: "release",
group: "Release Commands",
description: "Auto-generate a github release",
description: endent`
Create a GitHub release for a tag. Defaults to last tag in branch.

> NOTE: The tag must already be pushed to GitHub. If it isn't GitHub will create a tag pointing to the "to" option value.
`,
options: [
dryRun,
noVersionPrefix,
Expand All @@ -485,7 +489,7 @@ export const commands: AutoCommand[] = [
type: String,
group: "main",
description:
"Git revision (tag, commit sha, ...) to end release notes at. Defaults to HEAD",
"Git revision (tag, commit sha, ...) to end release notes at. Defaults to HEAD.",
},
{
name: "use-version",
Expand All @@ -499,7 +503,12 @@ export const commands: AutoCommand[] = [
],
examples: [
"{green $} auto release",
"{green $} auto release --from v0.20.1 --use-version v0.21.0",
{
desc:
"This command can be used in isolation easily. This example will: tag the release version at 'to' and create a GitHub release changelog over the commits range",
example:
"{green $} auto release --from v0.20.1 --to HEAD --use-version v0.21.0",
},
],
},
{
Expand Down
44 changes: 39 additions & 5 deletions packages/core/src/__tests__/auto.test.ts
Expand Up @@ -948,7 +948,8 @@ describe("Auto", () => {
expect(auto.git!.publish).toHaveBeenCalledWith(
"releaseNotes",
"v1.2.4",
false
false,
""
);
expect(afterRelease).toHaveBeenCalledWith(
expect.objectContaining({
Expand All @@ -958,6 +959,35 @@ describe("Auto", () => {
);
});


test("should use --to commit target", async () => {
const auto = new Auto({ ...defaults, plugins: [] });
auto.logger = dummyLog();
await auto.loadConfig();
auto.git!.getLatestRelease = () => Promise.resolve("1.2.3");

jest.spyOn(auto.git!, "publish").mockReturnValueOnce({ data: {} } as any);
jest
.spyOn(auto.release!, "generateReleaseNotes")
.mockImplementation(() => Promise.resolve("releaseNotes"));
auto.release!.getCommitsInRelease = () =>
Promise.resolve([makeCommitFromMsg("Test Commit")]);

auto.hooks.getPreviousVersion.tap("test", () => "1.2.4");
const afterRelease = jest.fn();
auto.hooks.afterRelease.tap("test", afterRelease);
jest.spyOn(auto.release!, "getCommits").mockImplementation();

await auto.runRelease({ to: 'abc'});

expect(auto.git!.publish).toHaveBeenCalledWith(
"releaseNotes",
"v1.2.4",
false,
"abc"
);
});

test("should publish to a tag", async () => {
const auto = new Auto({ ...defaults, plugins: [] });
auto.logger = dummyLog();
Expand Down Expand Up @@ -1013,7 +1043,8 @@ describe("Auto", () => {
expect(auto.git!.publish).toHaveBeenCalledWith(
"releaseNotes",
"v1.2.4",
true
true,
""
);
expect(afterRelease).toHaveBeenCalledWith(
expect.objectContaining({
Expand Down Expand Up @@ -1052,7 +1083,8 @@ describe("Auto", () => {
expect(auto.git!.publish).toHaveBeenCalledWith(
"releaseNotes",
"v1.2.4",
false
false,
""
);
expect(afterRelease).toHaveBeenCalledWith(
expect.objectContaining({
Expand Down Expand Up @@ -1091,7 +1123,8 @@ describe("Auto", () => {
expect(auto.git!.publish).toHaveBeenCalledWith(
"releaseNotes",
"v1.3.0",
false
false,
""
);
expect(afterRelease).toHaveBeenCalledWith(
expect.objectContaining({
Expand Down Expand Up @@ -1130,7 +1163,8 @@ describe("Auto", () => {
expect(auto.git!.publish).toHaveBeenCalledWith(
"releaseNotes",
"v1.2.3+1",
false
false,
""
);
expect(afterRelease).toHaveBeenCalledWith(
expect.objectContaining({
Expand Down
7 changes: 6 additions & 1 deletion packages/core/src/auto.ts
Expand Up @@ -193,6 +193,8 @@ export interface IAutoHooks {
DryRunOption & {
/** Commit to start calculating the version from */
from: string;
/** Commit to end calculating the version from */
to: string;
/** The version being released */
newVersion: string;
/** Whether the release being made is a prerelease */
Expand Down Expand Up @@ -551,7 +553,8 @@ export default class Auto {
const release = await this.git!.publish(
options.fullReleaseNotes,
options.newVersion,
options.isPrerelease
options.isPrerelease,
options.to
);

this.logger.log.info(release.data.html_url);
Expand Down Expand Up @@ -1472,6 +1475,7 @@ export default class Auto {
const release = await this.hooks.makeRelease.promise({
commits,
from: lastTag,
to: await this.git.getSha(),
isPrerelease: true,
newVersion,
fullReleaseNotes: releaseNotes,
Expand Down Expand Up @@ -1983,6 +1987,7 @@ export default class Auto {
const release = await this.hooks.makeRelease.promise({
dryRun,
from: lastRelease,
to: to || (await this.git.getSha()),
isPrerelease,
newVersion,
fullReleaseNotes: releaseNotes,
Expand Down
8 changes: 7 additions & 1 deletion packages/core/src/git.ts
Expand Up @@ -845,13 +845,19 @@ export default class Git {
}

/** Create a release for the GitHub project */
async publish(releaseNotes: string, tag: string, prerelease = false) {
async publish(
releaseNotes: string,
tag: string,
prerelease = false,
fallbackCommit?: string,
) {
this.logger.verbose.info("Creating release on GitHub for tag:", tag);

const result = await this.github.repos.createRelease({
owner: this.options.owner,
repo: this.options.repo,
tag_name: tag,
target_commitish: fallbackCommit,
name: tag,
body: releaseNotes,
prerelease,
Expand Down