From c4d56ef1a73827ab87d30313cf1eb17caa8756be Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 8 May 2023 15:43:49 -0400 Subject: [PATCH] chore: Don't fail daily alpha workflow when there is nothing to release Signed-off-by: Sebastian Malton --- .github/workflows/daily-alpha.yml | 1 + packages/release-tool/src/index.ts | 13 ++++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/daily-alpha.yml b/.github/workflows/daily-alpha.yml index 6e69181f44..41f56da3ce 100644 --- a/.github/workflows/daily-alpha.yml +++ b/.github/workflows/daily-alpha.yml @@ -35,4 +35,5 @@ jobs: env: BUMP_PACKAGE_ARGS: -- --conventional-commits --conventional-prerelease --yes PICK_ALL_PRS: "true" + FAIL_ON_NO_CHANGES: "false" GH_TOKEN: ${{ secrets.GH_TOKEN }} diff --git a/packages/release-tool/src/index.ts b/packages/release-tool/src/index.ts index 9f161624e8..e658246621 100755 --- a/packages/release-tool/src/index.ts +++ b/packages/release-tool/src/index.ts @@ -173,7 +173,18 @@ async function createReleaseBranchAndCommit(prBase: string, version: SemVer, prB await pipeExecFile("git", ["checkout", "-b", prBranch]); await pipeExecFile("git", ["add", "."]); - await pipeExecFile("git", ["commit", "-sm", `Release ${version.format()}`]); + + try { + await pipeExecFile("git", ["commit", "-sm", `Release ${version.format()}`]); + } catch (error) { + if (process.env.FAIL_ON_NO_CHANGES === "false") { + console.log("No changes to commit"); + return; + } + + throw error; + } + await pipeExecFile("git", ["push", "--set-upstream", "origin", prBranch]); await pipeExecFile("gh", [