public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Eugene Rozenfeld <erozen@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/microsoft/heads/main)] Fix error checking when init.sh returns -1 Date: Thu, 7 Oct 2021 01:20:37 +0000 (GMT) [thread overview] Message-ID: <20211007012037.5201E3858C39@sourceware.org> (raw) https://gcc.gnu.org/g:0b06e2be26be9f70fb6a082cf04aae47a36d3c3f commit 0b06e2be26be9f70fb6a082cf04aae47a36d3c3f Author: Victor Tong <vitong@microsoft.com> Date: Tue Oct 5 16:52:21 2021 -0700 Fix error checking when init.sh returns -1 Diff: --- .github/scripts/init.sh | 2 +- .github/scripts/pushMergedVendorBranch.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/scripts/init.sh b/.github/scripts/init.sh index 7a94c321be2..6d8d760ef5e 100644 --- a/.github/scripts/init.sh +++ b/.github/scripts/init.sh @@ -31,7 +31,7 @@ else # Check to make sure the gcc remote URL is the one we're expecting gccUrl="$(git config remote.gcc.url)" if [[ $gccUrl != "git://gcc.gnu.org/git/gcc.git" ]]; then - echo "ERROR: gcc upstream remote was found but it's not pointing to git://gcc.gnu.org/git/gcc.git" + echo "ERROR: gcc upstream remote was found but it's not pointing to git://gcc.gnu.org/git/gcc.git. Please delete the local gcc upstream remote before running init again" exit -1 fi fi \ No newline at end of file diff --git a/.github/scripts/pushMergedVendorBranch.sh b/.github/scripts/pushMergedVendorBranch.sh index d9850e78938..38ed145c0cd 100644 --- a/.github/scripts/pushMergedVendorBranch.sh +++ b/.github/scripts/pushMergedVendorBranch.sh @@ -28,6 +28,10 @@ BASEDIR=$(dirname $0) chmod +x ${BASEDIR}/init.sh ${BASEDIR}/init.sh +if test $? != 0; then + echo "ERROR: Initialization failed" + exit -1 +fi echo " ---- READ THIS ----
reply other threads:[~2021-10-07 1:20 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211007012037.5201E3858C39@sourceware.org \ --to=erozen@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).