mirror of
https://github.com/changesets/action
synced 2026-10-26 16:39:56 +08:00
Always update branch if there are any changesets
This commit is contained in:
Vendored
+1
-1
File diff suppressed because one or more lines are too long
@@ -155,39 +155,19 @@ import * as semver from "semver";
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
let { stderr } = await execWithOutput(
|
if (hasChangesets) {
|
||||||
"git",
|
let { stderr } = await execWithOutput(
|
||||||
["checkout", "changeset-release"],
|
"git",
|
||||||
{ ignoreReturnCode: true }
|
["checkout", "changeset-release"],
|
||||||
);
|
{ ignoreReturnCode: true }
|
||||||
let isCreatingChangesetReleaseBranch = !stderr
|
);
|
||||||
.toString()
|
let isCreatingChangesetReleaseBranch = !stderr
|
||||||
.includes("Switched to a new branch 'changeset-release'");
|
.toString()
|
||||||
if (isCreatingChangesetReleaseBranch) {
|
.includes("Switched to a new branch 'changeset-release'");
|
||||||
await exec("git", ["checkout", "-b", "changeset-release"]);
|
if (isCreatingChangesetReleaseBranch) {
|
||||||
}
|
await exec("git", ["checkout", "-b", "changeset-release"]);
|
||||||
|
}
|
||||||
|
|
||||||
let shouldBump = isCreatingChangesetReleaseBranch;
|
|
||||||
|
|
||||||
if (!shouldBump) {
|
|
||||||
console.log("checking if new changesets should be added");
|
|
||||||
let cmd = await execWithOutput("git", [
|
|
||||||
"merge-base",
|
|
||||||
"changeset-release",
|
|
||||||
github.context.sha
|
|
||||||
]);
|
|
||||||
const divergedAt = cmd.stdout.trim();
|
|
||||||
|
|
||||||
let diffOutput = await execWithOutput("git", [
|
|
||||||
"diff",
|
|
||||||
"--name-only",
|
|
||||||
`${divergedAt}...${github.context.sha}`
|
|
||||||
]);
|
|
||||||
const files = diffOutput.stdout.trim();
|
|
||||||
shouldBump = files.includes(".changeset");
|
|
||||||
console.log("checked if new changesets should be added " + shouldBump);
|
|
||||||
}
|
|
||||||
if (shouldBump) {
|
|
||||||
await exec("git", ["reset", "--hard", github.context.sha]);
|
await exec("git", ["reset", "--hard", github.context.sha]);
|
||||||
let changesetsCliPkgJson = await fs.readJson(
|
let changesetsCliPkgJson = await fs.readJson(
|
||||||
path.join("node_modules", "@changesets", "cli", "package.json")
|
path.join("node_modules", "@changesets", "cli", "package.json")
|
||||||
@@ -263,8 +243,6 @@ import * as semver from "semver";
|
|||||||
});
|
});
|
||||||
console.log("pull request found");
|
console.log("pull request found");
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
console.log("no new changesets");
|
|
||||||
}
|
}
|
||||||
})().catch(err => {
|
})().catch(err => {
|
||||||
console.error(err);
|
console.error(err);
|
||||||
|
|||||||
Reference in New Issue
Block a user