From patchwork Thu Jun 9 11:32:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12875331 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 95561C433EF for ; Thu, 9 Jun 2022 11:33:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233300AbiFILdn (ORCPT ); Thu, 9 Jun 2022 07:33:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241266AbiFILdI (ORCPT ); Thu, 9 Jun 2022 07:33:08 -0400 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B03823D6CF6 for ; Thu, 9 Jun 2022 04:32:32 -0700 (PDT) Received: by mail-wr1-x42d.google.com with SMTP id q15so23950198wrc.11 for ; Thu, 09 Jun 2022 04:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=M8NOAZr2tUKos2MUTXO8bHJbZ3VbbJO88fU9Ov7RXbs=; b=gL7Ngt5BBk0fCWjq8iuEdW6wazLSZsxl4bZKE7WttNEGMlL4E2fdmACG8sTuj/+FtD IuYlI6p5O2FtEOsup9Efxe2TG97UCIyAYIyJch0FFoAmdC+09xLAlHvNHDpqONoV3tfM OMsHFEeNOz4qZfEN/Wk/zblbN7Um3MLFELp/iWeKpwmihZWJ5VeAJKKvcYIqw2jaiZ6Y jOinWNUtZyr0pe2dhom6pQcjp3XE0pxEErQPnQecKEHMpNz7Jx3DnaHp7+aM25qYyDSX XImVSC9D0wOWDxDRXzc6PxBO7OMOfJkLaI9qGHiyT2vz6LjuLqOaNan28n+HJy3OhZp3 rPZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=M8NOAZr2tUKos2MUTXO8bHJbZ3VbbJO88fU9Ov7RXbs=; b=QQjl0pWtdJLoMY1ShByXNufIjYmm3BAJ9L2RfkQzStBoGJ4RaMm2uk0uN0gNZD20lv 23f56TTHwqMJrcFlOo8NzjE75hDlnfHwzRJDjcosC1bgNUvcWwRnU1Pp5MFXRB3wW8gN n8LOESts7rr2Bqdii963Ar/a2GX/pGVpTd6eISy0qV6826XS6RR9rioNP1p057R4976G B8nSDOokWtg4J8PCCKzWHftFA9hN+8a6EyGoh9z/ZQbxpgn+BOpwhv3kzRO6l2p3HAqy tJPXNbCls0aPR2fsLEBErwmFY866qGJucEcfKM+rfWs9BKDqcGNcRBDks869scck4Xg0 gjRQ== X-Gm-Message-State: AOAM531KX7nQVjfi2bD4DEKPRVbBHCQvdEqEv03ISIUEmexO1jOV4PVP Tn+SPSC2vkvK9i6IdG7bQINB2lIeTfMClqUD X-Google-Smtp-Source: ABdhPJxupV5v/rcMOHXzzitqEznUovyT3CXVENGG84NkxnETFa1Hh+/EON0aVsVNb3KWCnRYRmLDdA== X-Received: by 2002:a05:6000:1888:b0:218:3fab:c510 with SMTP id a8-20020a056000188800b002183fabc510mr20548935wri.473.1654774350924; Thu, 09 Jun 2022 04:32:30 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j3-20020adfea43000000b0020d02262664sm23781951wrn.25.2022.06.09.04.32.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 04:32:30 -0700 (PDT) Message-Id: <5212c5ec474b9441046203da363f2205795f213e.1654774347.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 09 Jun 2022 11:32:26 +0000 Subject: [PATCH 1/2] ci(github): use grouping also in the `win-build` job Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin We already do the same when building Git in all the other jobs. This will allow us to piggy-back on top of grouping to mark up compiler errors in the next commit. Signed-off-by: Johannes Schindelin --- ci/make-test-artifacts.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/make-test-artifacts.sh b/ci/make-test-artifacts.sh index 646967481f6..74141af0cc7 100755 --- a/ci/make-test-artifacts.sh +++ b/ci/make-test-artifacts.sh @@ -7,6 +7,6 @@ mkdir -p "$1" # in case ci/lib.sh decides to quit early . ${0%/*}/lib.sh -make artifacts-tar ARTIFACTS_DIRECTORY="$1" +group Build make artifacts-tar ARTIFACTS_DIRECTORY="$1" check_unignored_build_artifacts From patchwork Thu Jun 9 11:32:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12875333 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE997C43334 for ; Thu, 9 Jun 2022 11:35:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234749AbiFILfY (ORCPT ); Thu, 9 Jun 2022 07:35:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58080 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234091AbiFILdI (ORCPT ); Thu, 9 Jun 2022 07:33:08 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB9073D7D6A for ; Thu, 9 Jun 2022 04:32:33 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id m32-20020a05600c3b2000b0039756bb41f2so12446278wms.3 for ; Thu, 09 Jun 2022 04:32:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=VJMvU4ZBAG/mTNO81ze0RUPnJLbCHhKZRu250ls0VX0=; b=NSDxKVlWV5rfhhHmzozWEqvd34x+XSkFlhd5JKmCeBub46R5zHefC/aYM8ByNcvilN PC6Hx4q2x3PM7xotk+UNSXK5IJJD1iNLMpceGO+TiQ/7huIKPN4+uatahbrM28diNEi0 jjskF72dfh4eSix2hKUeWI9Y34rW4a1Y3aNvvytmFUSAy+JmHjpWl133UTdN4X9x6+CM H9v1AYdp6vhFYn8HtDASn/+zhPVskOz9mrnphLPDT+IasgqOleXMzfdB6F0jKUz/Mmrn 9m+jLyzLbD1NBBD7QZi2VWbPVWTUUJ1kclMehg7O7IrAltGmMv7jRNNf048bRTB0F2G7 L8xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=VJMvU4ZBAG/mTNO81ze0RUPnJLbCHhKZRu250ls0VX0=; b=LXCRBF4/yagnS5Y+nT/ka4zb1a5gqMjhNGuCEVWSt8UmI/5NqhktkfIOyOvNsYtCaM 6Ji8fyJ3pS3zDh09nbMuyozHPXTsbC8f85JryCBVAQVewROt/qHw4uGgYf3vy9asNz1D xExW4UbYD5kbpqHUqZZlsqlopjCyM/RNk4dYYh3oY+RD0a1sPZpBufIOIh5VC2+fL5TK tz3JaNIGrcpZLicMiNOGHb+6GgYd4uZ/ZBokOYqKOrg3Jm7xZuLMhIMPLwXkRZGE0QaV 7TE+D13DeczFrxF2dffAi4gJRookDDwg/ttdtICtKLxxwrVZBvqcile/vszCmTJHoW27 hI7Q== X-Gm-Message-State: AOAM532cl+t38cnjETbNP5QpcN/HnyTLU0PgPnxDI8vQFPn5xFPNBx0F fxC6pz3szddC/lVq596Bc/Tcd0AWH9rwlML1 X-Google-Smtp-Source: ABdhPJwTQNoqFdUX8laGhTJw31ulcPmxPNvcsp7U6nXCp+dj/PqQdu9rFjSpCtrFEOC6xvp4fORFTA== X-Received: by 2002:a05:600c:3ac7:b0:397:5cb4:a2b5 with SMTP id d7-20020a05600c3ac700b003975cb4a2b5mr2869533wms.5.1654774352031; Thu, 09 Jun 2022 04:32:32 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id ay13-20020a05600c1e0d00b003974b95d897sm21696527wmb.37.2022.06.09.04.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 04:32:31 -0700 (PDT) Message-Id: <19d6e34f038121b927cdfacc3c4ae5abd1791415.1654774347.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Thu, 09 Jun 2022 11:32:27 +0000 Subject: [PATCH 2/2] ci(github): also mark up compile errors Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin When GCC produces those helpful errors, we will want to present them in the GitHub workflow runs in the most helpful manner. To that end, we want to use workflow commands to render errors and warnings: https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions In the previous commit, we ensured that grouping is used for the build in all jobs, and this allows us to piggy-back onto the `group` function to transmogrify the output. Note: If `set -o pipefail` was available, we could do this in a little more elegant way. But since some of the steps are run using `dash`, we have to do a little `{ ...; echo $? >exit.status; } | ...` dance. Signed-off-by: Johannes Schindelin --- ci/lib.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ci/lib.sh b/ci/lib.sh index 2f6d9d26e40..b747e34842c 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -29,8 +29,14 @@ else set +x begin_group "$1" shift - "$@" - res=$? + # work around `dash` not supporting `set -o pipefail` + { + "$@" 2>&1 + echo $? >exit.status + } | + sed 's/^\(\([^ ]*\):\([0-9]*\):\([0-9]*:\) \)\(error\|warning\): /::\5 file=\2 line=\3::\1/' + res=$(cat exit.status) + rm exit.status end_group return $res }