From patchwork Mon Jun 13 13:13:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12879735 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 D31E4C433EF for ; Mon, 13 Jun 2022 15:39:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243812AbiFMPjn (ORCPT ); Mon, 13 Jun 2022 11:39:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351160AbiFMPi7 (ORCPT ); Mon, 13 Jun 2022 11:38:59 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A69AF157E88 for ; Mon, 13 Jun 2022 06:13:15 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id e5so2960210wma.0 for ; Mon, 13 Jun 2022 06:13:15 -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=VvydVbsP7HbYc8cSzn+5atkG40HtjaXq38FXmnqv0v2o0btvvX54lf5bdn1/T9EjTq XssboKjveBKJmJCXWoPIZDsaiZl3AxEsYF4b9oHxpq2vITXpvuuB0FYsOgjPwQpGzVps /dwxwmBjj5mWu5yOcJmIrG1UvBgmc6QbOcpGYKEJIO89kVitKiQPF/XwdZK5v2VLFhPy +NAMedsDPLorrdFiedVTs3SHS7Qw8pJlEMvxrWW7UvE0Gih6VP95MFvNQ3Il9ri8kPiz ds4B5NxU8sftqan78G0hdq2PIr2ss/YMuQkCBtB9ZctVFAYyV1kSTUjAJ570ZpUV1hFF fxeg== 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=5yhLJc5rMHE7ipIPgEIICJRXjgcR6pg6GbDDoWrm/f9RkUMgil/0DSEwZaquPWvinW S6rNEch9dCj0mGWNExu9H2+rgMz4Yej82Y1hAnE2+Y1RksOy6QU6d40rDZLBLNI6hbwm Uuq6EwaaEYrU+rFXoOiXg9o8sNMhSG2+rbVqfkqWkpWxPBhlaHwtVAwetTLOAmWqax+b CIVrd633blHOO+stfGq4G4boCNFKVLdKCeY8XCpqa3yJMKKI/zRh0FWz61o+VIz1jsoR NsCiZ9MRXIi6f+q169A0C+sTWo3tCxD2MiBx4lW8kVAjyjVpA3L177Z34M9+oB5neq37 WOsA== X-Gm-Message-State: AOAM530FFFsWo4xQxqrdEVShOfWRt7mZeOBDgw6FwwytgJKb5QzYEoiQ Iyg52NNZb+o8j+rGkLBuE1/hYcyVJpGK3A== X-Google-Smtp-Source: ABdhPJz1uPjLEwBGdpPu7hTZCeRVI0JcBFMtVI0hV0jN1ddzSQ5geRISZCTpjM1jfxkFbC3Laeb/hA== X-Received: by 2002:a05:600c:1c10:b0:39c:4708:648d with SMTP id j16-20020a05600c1c1000b0039c4708648dmr14822556wms.85.1655125991349; Mon, 13 Jun 2022 06:13:11 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id n4-20020a5d4204000000b0020c5253d8casm8440210wrq.22.2022.06.13.06.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 06:13:10 -0700 (PDT) Message-Id: <5212c5ec474b9441046203da363f2205795f213e.1655125988.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 13 Jun 2022 13:13:07 +0000 Subject: [PATCH v2 1/2] ci(github): use grouping also in the `win-build` job Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , 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 Mon Jun 13 13:13:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12879733 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 60E59C43334 for ; Mon, 13 Jun 2022 15:39:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236370AbiFMPjW (ORCPT ); Mon, 13 Jun 2022 11:39:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350736AbiFMPi4 (ORCPT ); Mon, 13 Jun 2022 11:38:56 -0400 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC1C3157EB9 for ; Mon, 13 Jun 2022 06:13:20 -0700 (PDT) Received: by mail-wr1-x436.google.com with SMTP id k19so7080829wrd.8 for ; Mon, 13 Jun 2022 06:13:20 -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=2StqKQ6yDZeblOPKDMXNkYKypA2ex0BiUGVOjqSB0tI=; b=eqJ2H1hfWkrZ7Byatq46jKf3VmlDidewRXtFRD5YPye6npzutQRwC5Cu2AEYkz6xlm mDN9tyRucSaPA/moLBkUUVgouevQn02xnVWIM3upJwSnNZ9ecNYKqLdovmDEPIHDYkCF s92J6Bl0CFYUbbPfA6sNNCI9AlneHg6wjBDZWnxlXjU62jyIIgKlZZGXggPNNFB2qRvZ h4Dg/Xd8lE7NhhERFWdK8+GN/Bv/wD2NnnZyLiCAPv8KbhyX/tXMTU4fLo1bqPwBuWI1 qDeCLAm5/O2hskxQjKxs9Mg07WZCvAKS1+p1MOnPLQkcUeHHgjCTV2bK4iN640qq6cCn w7qg== 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=2StqKQ6yDZeblOPKDMXNkYKypA2ex0BiUGVOjqSB0tI=; b=FBb7uzYcpU/KO4IKU5njGCPb5686iHn0kIaI2RbIZ2EcXEne6C1S/y2MD2tt+TWJxU C6xBlL5+vPu9PMzJeKLos1+S2MQ9Ua8ek/0DDq5XFI3yHGhcNftoajoIS7xXtazlJPNR OdBlGiahGOlOcgsgFy/2bcyWenV5ruci7TSEetgoBmnw6QGf0Jx5rlQc1yooBk38ifSN am02x8yTo+E9gVOolK3UqRdIYyFXK8uE+AIEoEcR6dEvX6ZV/4bFmUEqsZwYfZWjArPq akUCgcZdlpwk+JHl5orI+PEqQzQlxMVkP6dzfx3/61qW/9g2FSJjt75VrySui/a/+SHL QY8g== X-Gm-Message-State: AOAM533pqd9+4PxIgtVYbvXy2u2R/d5LLxKksvoP9TYCTZAdPW2z6idR CdpnAmRkJJskI8vGGtgYeKle6KUdZwXlFw== X-Google-Smtp-Source: ABdhPJx4I40q7+FOQXAE8VI3jiTD4UGdW9Pz0sKpLWV8dreh2EcORdZGNoODslfApKkHhy6AyZFvvQ== X-Received: by 2002:a5d:498f:0:b0:215:4d13:477e with SMTP id r15-20020a5d498f000000b002154d13477emr48698528wrq.155.1655125992841; Mon, 13 Jun 2022 06:13:12 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id q14-20020adfea0e000000b00213ba4b5d94sm10246228wrm.27.2022.06.13.06.13.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jun 2022 06:13:11 -0700 (PDT) Message-Id: <34daf06bb710434a2392b3cb91d35047565d5602.1655125988.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Mon, 13 Jun 2022 13:13:08 +0000 Subject: [PATCH v2 2/2] ci(github): also mark up compile errors Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , 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..aa7e979a0bf 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 }