From 1200052318f5974120f48275085f46723480ac23 Mon Sep 17 00:00:00 2001 From: Rena Wolford Date: Sun, 31 Jul 2022 14:29:53 +0200 Subject: [PATCH] fix: add a specific error message for the commit queue (#645) --- lib/landing_session.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/landing_session.js b/lib/landing_session.js index e4478ea..3d7f863 100644 --- a/lib/landing_session.js +++ b/lib/landing_session.js @@ -406,8 +406,13 @@ export default class LandingSession extends Session { if (!forceLand) { cli.info( - 'Use --fixupAll option, squash the PR manually or land the PR from ' + - 'the command line.' + 'GITHUB_ACTION' in process.env + + ? 'Add `commit-queue-squash` label to land the PR as one commit, ' + + 'or `commit-queue-rebase` to land as separate commits.' + + : 'Use --fixupAll option, squash the PR manually or land the PR ' + + 'from the command line.' ); process.exit(1); }