From d1192af0902dd28227330d759e226cb3162c4ab6 Mon Sep 17 00:00:00 2001 From: Logan McAnsh Date: Wed, 13 Apr 2022 12:46:25 -0400 Subject: [PATCH 1/2] chore: update nightly scripting Signed-off-by: Logan McAnsh --- .github/workflows/nightly.yml | 3 ++- scripts/version.js | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 0236e630cd0..b055acdc5be 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -48,7 +48,8 @@ jobs: echo ::set-output name=NEXT_VERSION::${NEXT_VERSION} git checkout -b nightly/${NEXT_VERSION} - npm version ${NEXT_VERSION} + + yarn run version ${NEXT_VERSION} --skip-prompt git push origin --tags diff --git a/scripts/version.js b/scripts/version.js index 9de93776b0e..da96e84f5c1 100644 --- a/scripts/version.js +++ b/scripts/version.js @@ -35,10 +35,12 @@ async function run(args) { } // Confirm the next version number - let answer = await prompt( - `Are you sure you want to bump version ${currentVersion} to ${nextVersion}? [Yn] ` - ); - if (answer === false) return 0; + if (prereleaseId !== "--skip-prompt") { + let answer = await prompt( + `Are you sure you want to bump version ${currentVersion} to ${nextVersion}? [Yn] ` + ); + if (answer === false) return 0; + } await incrementRemixVersion(nextVersion); } From bed6fa3f266ec97eea81d9b56d56ac7068f278f1 Mon Sep 17 00:00:00 2001 From: Logan McAnsh Date: Wed, 13 Apr 2022 13:37:54 -0400 Subject: [PATCH 2/2] Update nightly.yml --- .github/workflows/nightly.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index b055acdc5be..c5cd3c9f849 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -48,7 +48,15 @@ jobs: echo ::set-output name=NEXT_VERSION::${NEXT_VERSION} git checkout -b nightly/${NEXT_VERSION} - + + if [ -z "$(git status --porcelain)" ]; then + echo "✨" + else + echo "dirty working directory..." + git add . + git commit -m "dirty working directory..." + fi + yarn run version ${NEXT_VERSION} --skip-prompt git push origin --tags