From patchwork Wed Apr 8 04:05:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479279 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A759115AB for ; Wed, 8 Apr 2020 04:06:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8529C20747 for ; Wed, 8 Apr 2020 04:06:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cY9J2u8f" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726192AbgDHEGB (ORCPT ); Wed, 8 Apr 2020 00:06:01 -0400 Received: from mail-pg1-f173.google.com ([209.85.215.173]:44524 "EHLO mail-pg1-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725440AbgDHEGB (ORCPT ); Wed, 8 Apr 2020 00:06:01 -0400 Received: by mail-pg1-f173.google.com with SMTP id n13so1312753pgp.11 for ; Tue, 07 Apr 2020 21:06:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/0vKyosLD4rHyW4R/Z7z7R7kmZFe4+LtnGU9TrWpGSc=; b=cY9J2u8ftpYhV+b70Xm4fzl74PqW8zOWQsXGVDexEtyV0FOWmQ040pdWU5Dtq2/Ztt donzZPCyJYlwmSDJIcpiPj1gRzSPfAYmLWmDV9275FGwTwQrRTHIrQYWR5H7DjvKViOS 07HrbF6fLgph/HMr4l/0SmnCCx1KD8DXwUUZUodCbhDFpuI4wjXmkcRkSb04N5yVlket pkkfcx8yZrPErlEbsNWi2AbJ0laP++fgapRFvoXIc05NmwmtTEDmr6OyJANCx8idV80G vxoLaocmaaYElfUNWQ6L/K8aSiZWAeZ92suXIdinKcw+lSWFU1w4ZzGt/4PW/iuIrgJs odCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/0vKyosLD4rHyW4R/Z7z7R7kmZFe4+LtnGU9TrWpGSc=; b=FissCpPCO5CezsbRD/tU80kv7ndYwzgDR5uYEJhek1HUJMwx9pLODU3NhweSiMXCly fwFhZ+Gc4vvBY0WsFvvwax9jaHia5OPPxFYw37ksb4hx9vkzLK/Tz7kWboMisUWWqj7q Vro5V8juSV+JImBfTTEuxJweGgqNWeMzn1pyS7FbxtAf52iKcgBv19t9EOoataFO5mxS IZhqHSAmfrySkpX0ORIr72KcB04GJs7TufpATyNvqltaxRen7+QilNom6UdyNhaeAKRe OzE9k/7uPwxz+U7zIsLb0N3WYdGsGKrfXKRy5kd6kdQOgTMdVBtW3D0h8TVZfDmlNmKV hQrQ== X-Gm-Message-State: AGi0PubopvjKUdekdsromX/cMy9XK7ealYD5rCFGGL30ZQauvqK3pi5v IsyI31A25RfeybzLJzd0oBzPJH4ZTdE= X-Google-Smtp-Source: APiQypLmZUi9KVOpHGHAHHzdvRkwdgp51RWIhVhvhUr6inRXffHUVXavcFUGm34Jrjm+OKt4/Gtd8Q== X-Received: by 2002:a63:6246:: with SMTP id w67mr5351211pgb.212.1586318759899; Tue, 07 Apr 2020 21:05:59 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.05.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:05:59 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 01/12] ci/lib: if CI type is unknown, show the environment variables Date: Wed, 8 Apr 2020 11:05:32 +0700 Message-Id: <2219bf3db9e247f5f4fb5d518f22709909d57a1c.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin This should help with adding new CI-specific if-else arms. Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- ci/lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/lib.sh b/ci/lib.sh index e9a5c51425..05fbcf681a 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -138,6 +138,7 @@ then GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" else echo "Could not identify CI type" >&2 + env >&2 exit 1 fi From patchwork Wed Apr 8 04:05:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479283 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 09F421894 for ; Wed, 8 Apr 2020 04:06:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DC33720730 for ; Wed, 8 Apr 2020 04:06:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="t/WvzZ+d" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726467AbgDHEGF (ORCPT ); Wed, 8 Apr 2020 00:06:05 -0400 Received: from mail-pj1-f67.google.com ([209.85.216.67]:39532 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726345AbgDHEGE (ORCPT ); Wed, 8 Apr 2020 00:06:04 -0400 Received: by mail-pj1-f67.google.com with SMTP id z3so638954pjr.4 for ; Tue, 07 Apr 2020 21:06:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CPaFjH3KSipdKUWur4l/zTpSGAbUmVPzhzG653GbFBo=; b=t/WvzZ+dtuoDEZkHa+W2iaihgSmyE6oSnU+TYe1niJ0WGqH7NMgYeLL4yUORfqtgkW 5ZEYF6+g/LxXz+NhHSNOIxjqwn3qtcYCjfo4fGO9YchNT8WZtmRxOAMOHGskvElo0Zjs PJtp9cO4vHDUivp1L06o9MNkt/wT9woIy4tf5KH3qQUQXikYLyxyimyahxp+EJrkU/bg +DgMtbTlO/+8kFfqmofYFk/hea+xnYn60rkFg9hIjHvSP/qFUO4p19jKvQ3ZnT7vmyBo vvhDDzKq9dpVhsUOCTNraTtHongzO5aKiGXJEpbb5A5G6yqEkKKdYEBewElU95Xd0vSX SXmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=CPaFjH3KSipdKUWur4l/zTpSGAbUmVPzhzG653GbFBo=; b=nNUUBb78lFM4xL45RY7EavMrNwmvuQxGx7kUdrM/6ytct7BMrJPOxo8f/fRatVAK3g SkQV0dNW5ubONADL3pvVfJNUzcI0FM2iKYB4Bd8LpBQ3T/nFxLAZVpymXLxLgtJrorcf FccviapqRa41+wEycUBxtp0bgPzLjxlkCE3Mq8O14Xpq0DWYUYCE073krSvqivpkgu6M I9MBC3yoK0cEYCVbEailYy/yGw0dLPgL8TNnTfr00lFxYvcHfPRWjbv6UvRruQ+iqnZA PU94X3gw5SJ7WZNJ4GgX3FJQ7U3jL7lPgGNuTlsIwrf5tIjqXuq7wJyVVg9FRq0Ddd8N ezDw== X-Gm-Message-State: AGi0PuaLyVZ8w6ttzdHONRIsaFHGhv30vuNcgqxVoDH3pSsVt1wIY+OJ 3vq+RiqqXFvIMRf63RdRcmdYJ55O7nw= X-Google-Smtp-Source: APiQypJFQ6YYHB/HmhOqYfTTno2a6zUrZhAJfy5Upnm29qecx6avFcpkV4QmT1degiOuzT8ZPZ7gGg== X-Received: by 2002:a17:90a:8cf:: with SMTP id 15mr3085646pjn.76.1586318761728; Tue, 07 Apr 2020 21:06:01 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:01 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 02/12] ci/lib: allow running in GitHub Actions Date: Wed, 8 Apr 2020 11:05:33 +0700 Message-Id: <2818799a4b135db019ac48c59b25032f8cd291ad.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin For each CI system we support, we need a specific arm in that if/else construct in ci/lib.sh. Let's add one for GitHub Actions. Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- ci/lib.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/ci/lib.sh b/ci/lib.sh index 05fbcf681a..a21c6241b0 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -34,7 +34,7 @@ save_good_tree () { # successfully before (e.g. because the branch got rebased, changing only # the commit messages). skip_good_tree () { - if test "$TRAVIS_DEBUG_MODE" = true + if test "$TRAVIS_DEBUG_MODE" = true || test true = "$GITHUB_ACTIONS" then return fi @@ -136,6 +136,24 @@ then MAKEFLAGS="$MAKEFLAGS --jobs=10" test windows_nt != "$CI_OS_NAME" || GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" +elif test true = "$GITHUB_ACTIONS" +then + CI_TYPE=github-actions + CI_BRANCH="$GITHUB_REF" + CI_COMMIT="$GITHUB_SHA" + CI_OS_NAME="$(echo "$RUNNER_OS" | tr A-Z a-z)" + test macos != "$CI_OS_NAME" || CI_OS_NAME=osx + CI_REPO_SLUG="$GITHUB_REPOSITORY" + CI_JOB_ID="$GITHUB_RUN_ID" + CC="${CC:-gcc}" + + cache_dir="$HOME/none" + + export GIT_PROVE_OPTS="--timer --jobs 10" + export GIT_TEST_OPTS="--verbose-log -x" + MAKEFLAGS="$MAKEFLAGS --jobs=10" + test windows != "$CI_OS_NAME" || + GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" else echo "Could not identify CI type" >&2 env >&2 From patchwork Wed Apr 8 04:05:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479281 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1E211392 for ; Wed, 8 Apr 2020 04:06:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B11A220730 for ; Wed, 8 Apr 2020 04:06:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KxzwVIqG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726436AbgDHEGE (ORCPT ); Wed, 8 Apr 2020 00:06:04 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33458 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725440AbgDHEGE (ORCPT ); Wed, 8 Apr 2020 00:06:04 -0400 Received: by mail-pg1-f194.google.com with SMTP id d17so2761080pgo.0 for ; Tue, 07 Apr 2020 21:06:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GT0TpvTmy2q5lZKq0oThu8BDwzlulVSHnkrfqEkAQfU=; b=KxzwVIqGl09cN+7YLMC17q93w8MeTgyYajVBbsJt1vNCGdotMGlzT5k/mD+zIA1qQx aT/l+FSZZh8mbLZhKxQtWhCq9aHiFP4U/9NppsMj9VHmMC/cUzL+p47dc63IurFx3rqi NcZ71SHgY8k43IETS1L17ZeRzE7xfFBbLdEhCfwbyb0TtZ7KYC5wnaxs4pgGfhQZtVn3 gc3uqMCr9JiUT7PZQqrho3ZBzKg6b8Vfg8y6VKf6bsxAw4himbG4ICfrVJ3o8T9j8YHj u+gR3s4b+OIoUiwXoPtPln9dCCyQTQl1eSc3/BXZXL2i+zG8SwTu9DD68HVag34xjnM+ jkPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GT0TpvTmy2q5lZKq0oThu8BDwzlulVSHnkrfqEkAQfU=; b=mB5MI6q00rClnFkmuLeBWrKHmeiod0LswOdsTLJIEqW+QQkTuBNtVvf90tg/njqWxM kGb8N9+TjGFYEvn2l7lVMtIM9kZCI7kovZlca1QAPBHn3XbvMDsfCtu/AjmC8HuzLCq1 wrv0wluqTWLGF1085H6zMLwTWJ/3IEVM0oWx8L4RD7yhQ40PUHZAVdanwe3hWxqa/vX3 IHjQ/9Ef+tgKFSOLh5aWnGe/7CJpclR10VgfXf+A8SILLFXtpb/A9jUN22w+4peAiM/4 QLXc7qE1ka3944JAQRxTpy1UWZhbzC6ibK9KxCxCsRWbsIbYBN8xMgJ0jWw1eCmLhZS9 udpQ== X-Gm-Message-State: AGi0PubRb6nkbIY9PI+G1z5uNBlcRP0gNeKHRqo+ZQGRO70Os1pNJFNl RjVpfmFReqWaIBoFWNVssRcQlaesvYE= X-Google-Smtp-Source: APiQypJT9i1U8MI4dCUl5OxJrTjT3m6r96t/F+vDfawYwxa0po/HM7FkKt0QBUXO99Z9ZAMI6JFWzA== X-Received: by 2002:a65:5641:: with SMTP id m1mr4985979pgs.2.1586318763210; Tue, 07 Apr 2020 21:06:03 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:02 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 03/12] ci/lib: set TERM environment variable if not exist Date: Wed, 8 Apr 2020 11:05:34 +0700 Message-Id: X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org GitHub Action doesn't set TERM environment variable, which is required by "tput". Fallback to dumb if it's not set. Signed-off-by: Đoàn Trần Công Danh --- ci/lib.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/lib.sh b/ci/lib.sh index a21c6241b0..5c20975c83 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -79,6 +79,9 @@ check_unignored_build_artifacts () } } +# GitHub Action doesn't set TERM, which is required by tput +export TERM=${TERM:-dumb} + # Clear MAKEFLAGS that may come from the outside world. export MAKEFLAGS= From patchwork Wed Apr 8 04:05:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479285 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 36D821893 for ; Wed, 8 Apr 2020 04:06:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1517A20730 for ; Wed, 8 Apr 2020 04:06:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="NGP/sjvV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726483AbgDHEGH (ORCPT ); Wed, 8 Apr 2020 00:06:07 -0400 Received: from mail-pj1-f67.google.com ([209.85.216.67]:50465 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726345AbgDHEGH (ORCPT ); Wed, 8 Apr 2020 00:06:07 -0400 Received: by mail-pj1-f67.google.com with SMTP id b7so512981pju.0 for ; Tue, 07 Apr 2020 21:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cEZd3ru7g0htbMk1iD1kYmV9OS4NXcNnckWUMiLwPk0=; b=NGP/sjvVoRS+RWXE+XuYy3SZ+hzM6RuIzE8Gy7qk9QE8OBG5LmbWEW3OwTTjLDQpp5 CIWpyn8CEF4aZULDCSLlfBGlLWvtpWq4X+d/dMB8ROQL+oH7WPIlTcaYwn7jALmlt1zw G4u4p+pZ/gj0PX8UYLzYeq0Fnyv3z6o/Qs8vnZmtiA/13Mj7Bl+dpFeOc48mi9HMbLc1 9Y4h6Y5lPSwxKBmWcBZnVDuZqXGrzB2pCsGwiZmMxZqxhxwFNORgoPNxdtSoUFeDLBXl M3Qvf6ePX/epxkH/sXV4+P6+SbMnAcpUY+bpBD4hSCn1GFz/l/iNMwuFIM6lQzJCkpIe Mxsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cEZd3ru7g0htbMk1iD1kYmV9OS4NXcNnckWUMiLwPk0=; b=QO3RWLHFkkJmG1rRSBNAXzfblfF2bR1bkiCVCMDVObb6sn3wulAx8PoreY9hpqO536 oZLCDlU0kq2H/yxrHkW1aibJAr2j3IWEPsKsI9FnhPfmwtu4+SjgPz/FCbGBsGdeQzRj bzBJzsjQofW4NGbFTHVb3wqzGaOkWnXVkOLcozQGqh8Hsq9L0gSbAToE6zzTG6t7uhKw +RM/O/IwUtOKVD0gxvItPqvaNT1VLn70Rkpz0Mx06WQbdboFWeKgHHl9ciOFhlUiXEFN UAAQZNfTegbV2mWyejEZUH8175mjruGXeXHkqnuG13/RQQ4chdBhs7Ed6+p4cPsYi0YX F8uA== X-Gm-Message-State: AGi0PubCXfTvZGvC252i3nerwKGqxOC0l9FeiZY9/3yne6nd1NPRpj6g Qa1Knn8gYOg8StdFY4oA7kL66CaoSUU= X-Google-Smtp-Source: APiQypLXR3wZPWxzZ+6fEGoeMdRghjKw0ivXt4pQMEY/PXJFIYJeDV0c/dxKIZCcVGsikz6c/LKnTw== X-Received: by 2002:a17:90a:7d09:: with SMTP id g9mr2987053pjl.105.1586318764827; Tue, 07 Apr 2020 21:06:04 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:04 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 04/12] ci: fix the `jobname` of the `GETTEXT_POISON` job Date: Wed, 8 Apr 2020 11:05:35 +0700 Message-Id: <1df60e677c0b98b010c74914ab49f32a544bc59f.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin In 6cdccfce1e0f (i18n: make GETTEXT_POISON a runtime option, 2018-11-08), the `jobname` was adjusted to have the `GIT_TEST_` prefix, but that prefix makes no sense in this context. Co-authored-by: Đoàn Trần Công Danh Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- .travis.yml | 2 +- ci/lib.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cfc3c3428..05f3e3f8d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ compiler: matrix: include: - - env: jobname=GIT_TEST_GETTEXT_POISON + - env: jobname=GETTEXT_POISON os: linux compiler: addons: diff --git a/ci/lib.sh b/ci/lib.sh index 5c20975c83..8b39624f3c 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -211,7 +211,7 @@ osx-clang|osx-gcc) # Travis CI OS X export GIT_SKIP_TESTS="t9810 t9816" ;; -GIT_TEST_GETTEXT_POISON) +GETTEXT_POISON) export GIT_TEST_GETTEXT_POISON=true ;; Linux32) From patchwork Wed Apr 8 04:05:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479287 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 62AE41951 for ; Wed, 8 Apr 2020 04:06:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 40E8120730 for ; Wed, 8 Apr 2020 04:06:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AXcySWX4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726508AbgDHEGI (ORCPT ); Wed, 8 Apr 2020 00:06:08 -0400 Received: from mail-pj1-f66.google.com ([209.85.216.66]:33408 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726469AbgDHEGH (ORCPT ); Wed, 8 Apr 2020 00:06:07 -0400 Received: by mail-pj1-f66.google.com with SMTP id cp9so1772524pjb.0 for ; Tue, 07 Apr 2020 21:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=a3kKYxLCRN8HSBleLvkfmJ7KcIiCd1iKqb+rPAhGVRs=; b=AXcySWX4lWo4AY4dTQwRLKjACSPMMIC+ehU1dbJnTIp3iGUaMSQjuwqi3Ug6a8SNBC NSp8vdF17uDfYj3Mou9WeFK0lN/w40ZU9LtYHOlwQExrI5JZP0QYMn5CCur1fIKJIV0+ pLb7+qkQJRGChCI6HtkTqzwzECTcRA5J++CStWX0grw3iC2gPyz27Z9xXaP0zKyHKT7J uFNtIRQSGw8idetFcbLY71fi/LI166SZTuq9+92oyES+KIiawvdInLc4fGYi1HKv/ugg s+0nyVLV0xTfkswD0ki7p6/ZcQc/vjbnv+TDXJ674qxCYVn8IKZ0Q8y7i8/Eux1jmuoW RYew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=a3kKYxLCRN8HSBleLvkfmJ7KcIiCd1iKqb+rPAhGVRs=; b=Y+0eGVPEgswolExBy5V9g8tkQ8wfY0+afhZ/p6Kcqn7G7voxveK8AjbHKIim3jyWBJ 2AVWzbwnLBY/0CVdfEyeImyDa0GL42IJL8Tsn1OvobuSrE0/21WvjU98GD2AEmx21adV V02rI9dqulAf0y4H0VX16CYSFrWtaDiUrKhMp88eClyLzJ1SUGb0Zz5m8YczYkjAsA4V j+deOwptWqkOz/5lpmzN8+rLziSOhWp2364aQbRUXW9+IbxShNLSnm0u6NnuW+VmFKk1 pi3s69xr7GnWwE53q/3PBgN1AF8N3NY+50cl+qqSuOMni92IgQ9J8Ahu88351glCp7Y6 vxxA== X-Gm-Message-State: AGi0Pub3BOrfVWydkexjF5HEC1L0bOMZYC0vtBS1yGTCZIhUToY9XLyh aT8r7f1NyUDcO5JAomvMdTiPY7Si0wI= X-Google-Smtp-Source: APiQypJSk5V+58oq3+diYJoU40ePxMAXsj2KpDfmGqtVj20KDEZP30rTvPgkw8jseO18nDNgvGZK3w== X-Received: by 2002:a17:90a:362a:: with SMTP id s39mr3094085pjb.28.1586318766307; Tue, 07 Apr 2020 21:06:06 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:05 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 05/12] ci: explicit install all required packages Date: Wed, 8 Apr 2020 11:05:36 +0700 Message-Id: <4f80724641e17bf0d1937dbad77f987fbf86cd64.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In a later patch, we will support GitHub Action. Explicitly install all of our build dependencies. Since GitHub Action VM hasn't install our build dependencies, yet. And there're no harm to reinstall them (in Travis) Signed-off-by: Đoàn Trần Công Danh --- ci/install-dependencies.sh | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 497fd32ca8..371902bb75 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -7,12 +7,17 @@ P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION +UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev + perl-modules liberror-perl tcl tk gettext zlib1g-dev apache2 + libauthen-sasl-perl libemail-valid-perl libio-socket-ssl-perl + libnet-smtp-ssl-perl" case "$jobname" in linux-clang|linux-gcc) sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" sudo apt-get -q update - sudo apt-get -q -y install language-pack-is libsvn-perl apache2 + sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ + $UBUNTU_COMMON_PKGS case "$jobname" in linux-gcc) sudo apt-get -q -y install gcc-8 @@ -63,11 +68,16 @@ StaticAnalysis) ;; Documentation) sudo apt-get -q update - sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns + sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns \ + libcurl4-openssl-dev test -n "$ALREADY_HAVE_ASCIIDOCTOR" || gem install --version 1.5.8 asciidoctor ;; +GETTEXT_POISON) + sudo apt-get -q update + sudo apt-get -q -y install $UBUNTU_COMMON_PKGS + ;; esac if type p4d >/dev/null && type p4 >/dev/null From patchwork Wed Apr 8 04:05:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479289 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8D52818A4 for ; Wed, 8 Apr 2020 04:06:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C77C20730 for ; Wed, 8 Apr 2020 04:06:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CfEz3uGB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726521AbgDHEGL (ORCPT ); Wed, 8 Apr 2020 00:06:11 -0400 Received: from mail-pj1-f51.google.com ([209.85.216.51]:36832 "EHLO mail-pj1-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726469AbgDHEGJ (ORCPT ); Wed, 8 Apr 2020 00:06:09 -0400 Received: by mail-pj1-f51.google.com with SMTP id nu11so645134pjb.1 for ; Tue, 07 Apr 2020 21:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3sx9/YbpIJhEpk+6cj+C2cktu3z0l+GEx8rIPMU0dnw=; b=CfEz3uGBGDy0DrAZ5oypztM8lkurgiJeCCA9ZgdK034E/gXIiAmWJf/VIRDSzhDder H1JTGog0dJWqMjV1HdLHCrqPZNfhGuVRYs8uui7uwNmNiO6HFl7R9lgO1uPCoVrUamuL QWkC/ZdBtSUutqSMWwVWkEMxtWh+E+Kvnp20xSJpZjoAYnFc780Qrd9swqp2JcoxMO0s L1iHEdJ7jDkgnx63eCWfMlV+XDDS9qcngi7OBYrpJ7a1P19ZluaeAZ0FV7wuPYpwV75M lnJPoLEml/wBO8oyIEgRy4OBYt/QMG4av6dn5SXi2FXg0b01BYufDVdyQeKBt57EKLiK sSSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3sx9/YbpIJhEpk+6cj+C2cktu3z0l+GEx8rIPMU0dnw=; b=Aeh8JO9nPK8aLUtuNQPHgdsUkV+/DuJSZ5gvNC4gRiOpT/59V6fZsyHV9Ebc6DX4Lt AmSuLjBb181Bkv+eBioQt2W2orxsS6N6JIh6HwhCYvYpptNMQcqWmlWzEIeRB13PfC6n qC5Lww+lWiTM5BYN8IYHZ2R54vwFiNmt/PMUNzYt53KANFSa//3HoySZNxLwz8YdC+uq kKyqMfz4rYHXFHRYVUR2Az4m6Fz4HrAHVzZKkIJ2s1Er6Y/XHrvK3JONX6ct/nuN4HsC jaURgum9hHmA6qsB1KKC5ZKKxQ++zUm5ydAlD4c6AW3EDBjLFr1kk6ihdLur3w1ykj8v CrTA== X-Gm-Message-State: AGi0PuZD2Gx7vU8cWdztldOr4NLnojV/9sxiiYCtb69SGl4zVlisho/u FjHkAV+As6XOfY8RhHnVLUPXbT4s8MU= X-Google-Smtp-Source: APiQypKl62CxoY8m+JRGIxC5g0bBj+24OVH8GxvvDXAnWexZ6LhTJRUuI6curWcFHSIPALCbo/ibYg== X-Received: by 2002:a17:90a:240f:: with SMTP id h15mr3061227pje.176.1586318767935; Tue, 07 Apr 2020 21:06:07 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:07 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 06/12] ci: run gem with sudo to install asciidoctor Date: Wed, 8 Apr 2020 11:05:37 +0700 Message-Id: <795ec656c6172b139a5a55f1760e0ecfe434b5f3.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin In a later patch, we will run Documentation job in GitHub Actions. The job will run without elevated permission. Run `gem` with `sudo` to elevate permission in order to be able to install to system location. This will also keep this installation in-line with other installation in our Linux system for CI. Signed-off-by: Johannes Schindelin [Danh: reword commit message] Signed-off-by: Đoàn Trần Công Danh --- ci/install-dependencies.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 371902bb75..a6a1dafa15 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -72,7 +72,7 @@ Documentation) libcurl4-openssl-dev test -n "$ALREADY_HAVE_ASCIIDOCTOR" || - gem install --version 1.5.8 asciidoctor + sudo gem install --version 1.5.8 asciidoctor ;; GETTEXT_POISON) sudo apt-get -q update From patchwork Wed Apr 8 04:05:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479293 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7AFBE92C for ; Wed, 8 Apr 2020 04:06:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4633D20747 for ; Wed, 8 Apr 2020 04:06:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RTVVcE1/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726528AbgDHEGL (ORCPT ); Wed, 8 Apr 2020 00:06:11 -0400 Received: from mail-pl1-f173.google.com ([209.85.214.173]:34097 "EHLO mail-pl1-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbgDHEGL (ORCPT ); Wed, 8 Apr 2020 00:06:11 -0400 Received: by mail-pl1-f173.google.com with SMTP id a23so2066570plm.1 for ; Tue, 07 Apr 2020 21:06:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5SHU+f0PNij2KkX/foPQZWZKtAVqUl5kprEG8nMqMe8=; b=RTVVcE1/P+cnQpAARUnOow2PsBGzA4t9QbfP7rNcCvRgtbQW0cGELTxQvyypmzNHkN cMEiriKhO2pUmvZlREtEJGBfsI/58AQAjcYTW5jPGpqk/xwibBc5xr3MbktsALqrk58k sTuStMFO4ifASKjORnpUFNSCMlZ6e/J6VyRE7+B9+9DlRjJ678DIJENyC44e11YbF3ZI pkyzqmCygagsFOMFEeJ/QMG58VA7c4Nt9/sNLBdnLN66mWFP9xIydjU5e0UPdFmhBzwd c2+X2ISZYyo3QrkoMmdXeLbtR+5uTES6Uf65jKiX1pWgfiMYjmki1TwYdPK6cYd0v7+o u9hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5SHU+f0PNij2KkX/foPQZWZKtAVqUl5kprEG8nMqMe8=; b=fKMLp95gcmozxTphNstBCvEgo9oJKvMhrkbjArfDpETUmJtXu9q/eTkc+d9I/YLRvp FoQ/askyyOfVEe2FKG9+wvTHp4jbYBhUisdsGZiqSH2IQt9ZlI+zvAX9w7RIvL/iHNdy rfmG3PpvD5lFcbDGhv4ETUC/tlvZU6dGOrYePh/E+x+qR1vn7O4cGwtzr3BWLEL4esJ4 PrgcZBLRXjpMWcFjHHPESLHq1JbtNuFxrVWbg5fNQlrQUcAVBXFE+YQgO91REOFvBeRc lhPYR4TC/vEWhJb3khAE1qS9NkUQhjPqz1V//8LNm54/P96QA7Z7/W+X7xqkjin0W4SX g/9A== X-Gm-Message-State: AGi0Puabe+2LU7th7oVveGhkD0mz/GlieBzo1lJq6Lgnm3I+re3VS7Pw g2Egxc/AP1nY4UTfEHQkN0gKOFshbpk= X-Google-Smtp-Source: APiQypJM3eHmCUQoaYn2a+eRP4m4FhQ0ONsdivi+ipGH+uEgCurMMMZwBHE81ebtzmhETJrxl7OBiw== X-Received: by 2002:a17:90b:3656:: with SMTP id nh22mr2974335pjb.71.1586318769616; Tue, 07 Apr 2020 21:06:09 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:09 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Johannes Schindelin Subject: [PATCH v4 07/12] ci: configure GitHub Actions for CI/PR Date: Wed, 8 Apr 2020 11:05:38 +0700 Message-Id: X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org This patch adds CI builds via GitHub Actions. While the underlying technology is at least _very_ similar to that of Azure Pipelines, GitHub Actions are much easier to set up than Azure Pipelines: - no need to install a GitHub App, - no need to set up an Azure DevOps account, - all you need to do is push to your fork on GitHub. Therefore, it makes a lot of sense for us to have a working GitHub Actions setup. While copy/editing `azure-pipelines.yml` into `.github/workflows/main.yml`, we also use the opportunity to accelerate the step that sets up a minimal subset of Git for Windows' SDK in the Windows-build job: - we now download a `.tar.xz` stored in Azure Blobs and extract it simultaneously by calling `curl` and piping the result to `tar`, - decompressing via `xz`, - all three utilities are installed together with Git for Windows At the same time, we also make use of the matrix build feature, which reduces the amount of repeated text by quite a bit. Also, we do away with the parts that try to mount a file share on which `prove` can store data between runs. It is just too complicated to set up, and most times the tree changes anyway, so there is little return on investment there. Initial-patch-by: Johannes Schindelin Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- .github/workflows/main.yml | 212 +++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000000..e1ac6d23b4 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,212 @@ +name: CI/PR + +on: [push, pull_request] + +env: + DEVELOPER: 1 + +jobs: + windows-build: + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + - name: download git-sdk-64-minimal + shell: bash + run: a=git-sdk-64-minimal && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf - + - name: build + shell: powershell + env: + HOME: ${{runner.workspace}} + MSYSTEM: MINGW64 + NO_PERL: 1 + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" + printf '%s\n' /git-sdk-64-minimal/ >>.git/info/exclude + + ci/make-test-artifacts.sh artifacts + "@ + - name: upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: windows-artifacts + path: artifacts + windows-test: + runs-on: windows-latest + needs: [windows-build] + strategy: + matrix: + nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + steps: + - uses: actions/checkout@v1 + - name: download git-sdk-64-minimal + shell: bash + run: a=git-sdk-64-minimal && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf - + - name: download build artifacts + uses: actions/download-artifact@v1 + with: + name: windows-artifacts + path: ${{github.workspace}} + - name: extract build artifacts + shell: bash + run: tar xf artifacts.tar.gz + - name: test + shell: powershell + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" + # Let Git ignore the SDK + printf '%s\n' /git-sdk-64-minimal/ >>.git/info/exclude + + ci/run-test-slice.sh ${{matrix.nr}} 10 + "@ + - name: ci/print-test-failures.sh + if: failure() + shell: powershell + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh + vs-build: + env: + MSYSTEM: MINGW64 + NO_PERL: 1 + GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'" + runs-on: windows-latest + steps: + - uses: actions/checkout@v1 + - name: download git-sdk-64-minimal + shell: bash + run: a=git-sdk-64-minimal && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf - + - name: generate Visual Studio solution + shell: powershell + run: | + & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" + make NDEBUG=1 DEVELOPER=1 vcxproj + "@ + if (!$?) { exit(1) } + - name: download vcpkg artifacts + shell: powershell + run: | + $urlbase = "https://dev.azure.com/git/git/_apis/build/builds" + $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id + $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl + (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip") + Expand-Archive compat.zip -DestinationPath . -Force + Remove-Item compat.zip + - name: add msbuild to PATH + uses: microsoft/setup-msbuild@v1.0.0 + - name: MSBuild + run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142 + - name: bundle artifact tar + shell: powershell + env: + MSVC: 1 + VCPKG_ROOT: ${{github.workspace}}\compat\vcbuild\vcpkg + run: | + & compat\vcbuild\vcpkg_copy_dlls.bat release + if (!$?) { exit(1) } + & git-sdk-64-minimal\usr\bin\bash.exe -lc @" + mkdir -p artifacts && + eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts 2>&1 | grep ^tar)\" + "@ + - name: upload build artifacts + uses: actions/upload-artifact@v1 + with: + name: vs-artifacts + path: artifacts + vs-test: + runs-on: windows-latest + needs: [vs-build] + strategy: + matrix: + nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] + steps: + - uses: actions/checkout@v1 + - name: download git-64-portable + shell: bash + run: a=git-64-portable && mkdir -p $a && curl -# https://wingit.blob.core.windows.net/ci-artifacts/$a.tar.xz | tar -C $a -xJf - + - name: download build artifacts + uses: actions/download-artifact@v1 + with: + name: vs-artifacts + path: ${{github.workspace}} + - name: extract build artifacts + shell: bash + run: tar xf artifacts.tar.gz + - name: test (parallel) + shell: powershell + env: + MSYSTEM: MINGW64 + NO_SVN_TESTS: 1 + GIT_TEST_SKIP_REBASE_P: 1 + run: | + & git-64-portable\git-cmd.exe --command=usr\bin\bash.exe -lc @" + # Let Git ignore the SDK and the test-cache + printf '%s\n' /git-64-portable/ /test-cache/ >>.git/info/exclude + + cd t && + PATH=\"`$PWD/helper:`$PATH\" && + test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \ + `$(test-tool.exe path-utils slice-tests \ + ${{matrix.nr}} 10 t[0-9]*.sh) + "@ + regular: + strategy: + matrix: + vector: + - jobname: linux-clang + cc: clang + pool: ubuntu-latest + - jobname: linux-gcc + cc: gcc + pool: ubuntu-latest + - jobname: osx-clang + cc: clang + pool: macos-latest + - jobname: osx-gcc + cc: gcc + pool: macos-latest + - jobname: GETTEXT_POISON + cc: gcc + pool: ubuntu-latest + env: + CC: ${{matrix.vector.cc}} + jobname: ${{matrix.vector.jobname}} + runs-on: ${{matrix.vector.pool}} + steps: + - uses: actions/checkout@v1 + - run: ci/install-dependencies.sh + - run: ci/run-build-and-tests.sh + - run: ci/print-test-failures.sh + if: failure() + dockerized: + strategy: + matrix: + vector: + - jobname: linux-musl + image: alpine + - jobname: Linux32 + image: daald/ubuntu32:xenial + env: + jobname: ${{matrix.vector.jobname}} + runs-on: ubuntu-latest + container: ${{matrix.vector.image}} + steps: + - uses: actions/checkout@v1 + - run: ci/install-docker-dependencies.sh + - run: ci/run-build-and-tests.sh + - run: ci/print-test-failures.sh + if: failure() + static-analysis: + env: + jobname: StaticAnalysis + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: ci/install-dependencies.sh + - run: ci/run-static-analysis.sh + documentation: + env: + jobname: Documentation + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - run: ci/install-dependencies.sh + - run: ci/test-documentation.sh From patchwork Wed Apr 8 04:05:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479295 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A60DC1392 for ; Wed, 8 Apr 2020 04:06:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 84F0D20747 for ; Wed, 8 Apr 2020 04:06:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LeBQVWX1" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726539AbgDHEGN (ORCPT ); Wed, 8 Apr 2020 00:06:13 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:46447 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbgDHEGM (ORCPT ); Wed, 8 Apr 2020 00:06:12 -0400 Received: by mail-pl1-f194.google.com with SMTP id s23so2031945plq.13 for ; Tue, 07 Apr 2020 21:06:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gT7c91AbNzt9s4NLVVCFVAOJXpLUduxjSqCE+yLOFFQ=; b=LeBQVWX1UNdqwzIOxrRgVe/r39ioe5E1H9pyLk41XYQ9XMk424926apMPfmrb8Ca/J rfWh8g7siFi7th5LJyf65ZQcILVszo56zpHBjA5+fTd2ndh9EYe9v+kSQyyXdw5xD4U7 lE9a/a9JLSRjwI7WvesHQsO4+pt/uQfkYS35hJlDxv4VfSiV5tmDwc1/luvry4HKYwDM OdACs7x+h+3AoHJUBNS/XTvrCw4XMddwiFK9L7jmFbLwCPfeG+W1OR5v0onsFsX0ov1d ViLRmApwG5p6rz1L6J/ioCZrfNdw28WTS6dDjKabUi6nR0BR+sg6hOLrYO8RynmYxtMh Yd9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gT7c91AbNzt9s4NLVVCFVAOJXpLUduxjSqCE+yLOFFQ=; b=Mx54Ufozc1OH6NzpJEal6Mah58HUcOOE8P3cNr12sv6bw47uj1k7PyWSe3m/OJye1i 3V6w0Jmz0wDxsUgR797/dBFJbN0i2P1QHfmaw9Y6tzRw9lYWyXZeLGzN09IWPfKdyqlt k14lGWn7v4sI9dszBORzn4rJdxpkA6wu2vtgPoiASOX2+lGnFtLjRJDER9z+PwJF9CsM DU1PCE0Q7wrslKCl+AAFAUYe7Nq8tGWHzPLGX4orUv5xpNXyTM5RS8Vc+XknPel1hBby 8xaes9krPAsmdrpwJJkFLm1MoOTP4jKrk03FF+1nTItDS7TFg6mhYegluyMok46c2RnB UdYg== X-Gm-Message-State: AGi0PuZWJ/7IVn14BnwcIuztUqmhslsXyRBQ9KD+XYzojEBGpaT2U9dP wmXuaJpMsrw3aFCiBqX0dkUV7BZdJ5E= X-Google-Smtp-Source: APiQypKDJNmnsF2/LR9WUsmBvEda40YG17HgPyIH5c1+9hzCOIfQrhIdBBspmuweOGKay9QgZGEnkw== X-Received: by 2002:a17:90a:e02:: with SMTP id v2mr3027848pje.131.1586318771259; Tue, 07 Apr 2020 21:06:11 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:10 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 08/12] README: add a build badge for the GitHub Actions runs Date: Wed, 8 Apr 2020 11:05:39 +0700 Message-Id: <46f2b6bce6ec55853a8708a090ad7e8e751b0075.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9d4564c8aa..e2e00ae249 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![Build status](https://github.com/git/git/workflows/CI/PR/badge.svg)](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush) [![Build Status](https://dev.azure.com/git/git/_apis/build/status/git.git)](https://dev.azure.com/git/git/_build/latest?definitionId=11) Git - fast, scalable, distributed revision control system From patchwork Wed Apr 8 04:05:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479297 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E6A9715AB for ; Wed, 8 Apr 2020 04:06:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B03422076E for ; Wed, 8 Apr 2020 04:06:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZNDktAOK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726550AbgDHEGQ (ORCPT ); Wed, 8 Apr 2020 00:06:16 -0400 Received: from mail-pl1-f169.google.com ([209.85.214.169]:35624 "EHLO mail-pl1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726510AbgDHEGO (ORCPT ); Wed, 8 Apr 2020 00:06:14 -0400 Received: by mail-pl1-f169.google.com with SMTP id c12so2062865plz.2 for ; Tue, 07 Apr 2020 21:06:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8IDNYxGTTFzR2xbXg7IeZjoE+09kWxt7+/pFxM/ObS8=; b=ZNDktAOK+0XNpFqo20L/hCH9SYPmB2IxwnHLC3y6oLV9nLpDB9vhoUis+nLrdLF+gS apLm22ps3rmpTpXqJ63+36gKYoMlgiZUrACWtSwcGi+6Xt2C136eZLh197Bre/v/z3tC IbattJNJy93pHXkQYnOnsd1555zHU0/2sgXg4vvEf4Zy7Ax3QeOvMx6cBfhagVY/oRPB mTtZ5N4aWe9M4FWyWhDDX8kvcxVCx4pycg9kLCTwz1Q7lPFiNSaZbz6mf0CzVs/ZXiMm kxEtqBhWBQSyMrGn2XhADeqqHikPnGrOZUCcfOnT6pBhV9038WPCFd0XxMYUsqe0Iwi+ DbvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8IDNYxGTTFzR2xbXg7IeZjoE+09kWxt7+/pFxM/ObS8=; b=YLLSKPN+DovtReRQ9zq1T0ybLmcOjGq64vkLV7WLVu9VDtQLc2bDl8P4wzNu5fncFR NXupu2Pa3Vs63YM8IhK2+TXu6+VtZaGeYzdHzJIVVvGEohfgeB14a8nF05VoBmxri/1f VOav7dfZpAHaqVC/bvTUZtKas6LEACrNnZu5HT5Ldh18p54hI9676QQoytfQ7BDjdvOC xSa5ZVH5C6m1mkIfVWgt8InR9xAUa8UmvgsoEDi4R84ryeSjlBLTjzX6KLJWgONZLia7 X4S81R5CiYjnSiScS8TzLmAAzjUG6PKVXrTa8ZP4AF6VgpjBSbPZMUm5i5cIjG0Kc9KP JkGg== X-Gm-Message-State: AGi0PuYMYN8+/L5cWY6KikZs44PmpCE8KhkYYN9RACJsEtOqznUi8Dhc LLk3hOq3/hPjzLkqUiCi8CxtExsjMKg= X-Google-Smtp-Source: APiQypJv+J/Yqxd/b2Mw88DH7Tm+Rs4qMwdCMnsESvxXArSEf4EyFHj1oLpKOteAwO6KB52Yup5b/Q== X-Received: by 2002:a17:902:b707:: with SMTP id d7mr5131508pls.297.1586318773155; Tue, 07 Apr 2020 21:06:13 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:12 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 09/12] ci: retire the Azure Pipelines definition Date: Wed, 8 Apr 2020 11:05:40 +0700 Message-Id: <92f2623dc7d2da1e78edfbfbe289bd7722abb543.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin We have GitHub Actions now. Running the same builds and tests in Azure Pipelines would be redundant, and a waste of energy. Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- README.md | 1 - azure-pipelines.yml | 558 -------------------------------------------- 2 files changed, 559 deletions(-) delete mode 100644 azure-pipelines.yml diff --git a/README.md b/README.md index e2e00ae249..eb8115e6b0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ [![Build status](https://github.com/git/git/workflows/CI/PR/badge.svg)](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush) -[![Build Status](https://dev.azure.com/git/git/_apis/build/status/git.git)](https://dev.azure.com/git/git/_build/latest?definitionId=11) Git - fast, scalable, distributed revision control system ========================================================= diff --git a/azure-pipelines.yml b/azure-pipelines.yml deleted file mode 100644 index 11413f66f8..0000000000 --- a/azure-pipelines.yml +++ /dev/null @@ -1,558 +0,0 @@ -variables: - Agent.Source.Git.ShallowFetchDepth: 1 - -jobs: -- job: windows_build - displayName: Windows Build - condition: succeeded() - pool: - vmImage: windows-latest - timeoutInMinutes: 240 - steps: - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no - cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\ - } - displayName: 'Mount test-cache' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - powershell: | - $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds" - $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id - $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl - (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip") - Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force - Remove-Item git-sdk-64-minimal.zip - - # Let Git ignore the SDK and the test-cache - "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude" - displayName: 'Download git-sdk-64-minimal' - - powershell: | - & git-sdk-64-minimal\usr\bin\bash.exe -lc @" - ci/make-test-artifacts.sh artifacts - "@ - if (!$?) { exit(1) } - displayName: Build - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - DEVELOPER: 1 - NO_PERL: 1 - - task: PublishPipelineArtifact@0 - displayName: 'Publish Pipeline Artifact: test artifacts' - inputs: - artifactName: 'windows-artifacts' - targetPath: '$(Build.SourcesDirectory)\artifacts' - - task: PublishPipelineArtifact@0 - displayName: 'Publish Pipeline Artifact: git-sdk-64-minimal' - inputs: - artifactName: 'git-sdk-64-minimal' - targetPath: '$(Build.SourcesDirectory)\git-sdk-64-minimal' - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - cmd /c rmdir "$(Build.SourcesDirectory)\test-cache" - } - displayName: 'Unmount test-cache' - condition: true - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - -- job: windows_test - displayName: Windows Test - dependsOn: windows_build - condition: succeeded() - pool: - vmImage: windows-latest - timeoutInMinutes: 240 - strategy: - parallel: 10 - steps: - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no - cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\ - } - displayName: 'Mount test-cache' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact: test artifacts' - inputs: - artifactName: 'windows-artifacts' - targetPath: '$(Build.SourcesDirectory)' - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact: git-sdk-64-minimal' - inputs: - artifactName: 'git-sdk-64-minimal' - targetPath: '$(Build.SourcesDirectory)\git-sdk-64-minimal' - - powershell: | - & git-sdk-64-minimal\usr\bin\bash.exe -lc @" - test -f artifacts.tar.gz || { - echo No test artifacts found\; skipping >&2 - exit 0 - } - tar xf artifacts.tar.gz || exit 1 - - # Let Git ignore the SDK and the test-cache - printf '%s\n' /git-sdk-64-minimal/ /test-cache/ >>.git/info/exclude - - ci/run-test-slice.sh `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE || { - ci/print-test-failures.sh - exit 1 - } - "@ - if (!$?) { exit(1) } - displayName: 'Test (parallel)' - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - NO_SVN_TESTS: 1 - GIT_TEST_SKIP_REBASE_P: 1 - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - cmd /c rmdir "$(Build.SourcesDirectory)\test-cache" - } - displayName: 'Unmount test-cache' - condition: true - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'windows' - platform: Windows - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: vs_build - displayName: Visual Studio Build - condition: succeeded() - pool: - vmImage: windows-latest - timeoutInMinutes: 240 - steps: - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no - cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\ - } - displayName: 'Mount test-cache' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - powershell: | - $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds" - $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id - $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl - (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip") - Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force - Remove-Item git-sdk-64-minimal.zip - - # Let Git ignore the SDK and the test-cache - "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude" - displayName: 'Download git-sdk-64-minimal' - - powershell: | - & git-sdk-64-minimal\usr\bin\bash.exe -lc @" - make NDEBUG=1 DEVELOPER=1 vcxproj - "@ - if (!$?) { exit(1) } - displayName: Generate Visual Studio Solution - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - DEVELOPER: 1 - NO_PERL: 1 - GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'" - - powershell: | - $urlbase = "https://dev.azure.com/git/git/_apis/build/builds" - $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id - $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl - (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip") - Expand-Archive compat.zip -DestinationPath . -Force - Remove-Item compat.zip - displayName: 'Download vcpkg artifacts' - - task: MSBuild@1 - inputs: - solution: git.sln - platform: x64 - configuration: Release - maximumCpuCount: 4 - msbuildArguments: /p:PlatformToolset=v142 - - powershell: | - & compat\vcbuild\vcpkg_copy_dlls.bat release - if (!$?) { exit(1) } - & git-sdk-64-minimal\usr\bin\bash.exe -lc @" - mkdir -p artifacts && - eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts | grep ^tar)\" - "@ - if (!$?) { exit(1) } - displayName: Bundle artifact tar - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - DEVELOPER: 1 - NO_PERL: 1 - MSVC: 1 - VCPKG_ROOT: $(Build.SourcesDirectory)\compat\vcbuild\vcpkg - - powershell: | - $tag = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-tag.txt").content - $version = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-version.txt").content - $url = "https://github.com/git-for-windows/git/releases/download/${tag}/PortableGit-${version}-64-bit.7z.exe" - (New-Object Net.WebClient).DownloadFile($url,"PortableGit.exe") - & .\PortableGit.exe -y -oartifacts\PortableGit - # Wait until it is unpacked - while (-not @(Remove-Item -ErrorAction SilentlyContinue PortableGit.exe; $?)) { sleep 1 } - displayName: Download & extract portable Git - - task: PublishPipelineArtifact@0 - displayName: 'Publish Pipeline Artifact: MSVC test artifacts' - inputs: - artifactName: 'vs-artifacts' - targetPath: '$(Build.SourcesDirectory)\artifacts' - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - cmd /c rmdir "$(Build.SourcesDirectory)\test-cache" - } - displayName: 'Unmount test-cache' - condition: true - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - -- job: vs_test - displayName: Visual Studio Test - dependsOn: vs_build - condition: succeeded() - pool: - vmImage: windows-latest - timeoutInMinutes: 240 - strategy: - parallel: 10 - steps: - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no - cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\ - } - displayName: 'Mount test-cache' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: DownloadPipelineArtifact@0 - displayName: 'Download Pipeline Artifact: VS test artifacts' - inputs: - artifactName: 'vs-artifacts' - targetPath: '$(Build.SourcesDirectory)' - - powershell: | - & PortableGit\git-cmd.exe --command=usr\bin\bash.exe -lc @" - test -f artifacts.tar.gz || { - echo No test artifacts found\; skipping >&2 - exit 0 - } - tar xf artifacts.tar.gz || exit 1 - - # Let Git ignore the SDK and the test-cache - printf '%s\n' /PortableGit/ /test-cache/ >>.git/info/exclude - - cd t && - PATH=\"`$PWD/helper:`$PATH\" && - test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \ - `$(test-tool.exe path-utils slice-tests \ - `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE t[0-9]*.sh) - "@ - if (!$?) { exit(1) } - displayName: 'Test (parallel)' - env: - HOME: $(Build.SourcesDirectory) - MSYSTEM: MINGW64 - NO_SVN_TESTS: 1 - GIT_TEST_SKIP_REBASE_P: 1 - - powershell: | - if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") { - cmd /c rmdir "$(Build.SourcesDirectory)\test-cache" - } - displayName: 'Unmount test-cache' - condition: true - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'vs' - platform: Windows - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-vs-test-artifacts - -- job: linux_clang - displayName: linux-clang - condition: succeeded() - pool: - vmImage: ubuntu-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - sudo apt-get update && - sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2-bin && - - export CC=clang || exit 1 - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'linux-clang' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: linux_gcc - displayName: linux-gcc - condition: succeeded() - pool: - vmImage: ubuntu-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - sudo add-apt-repository ppa:ubuntu-toolchain-r/test && - sudo apt-get update && - sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2 language-pack-is git-svn gcc-8 || exit 1 - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'linux-gcc' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: osx_clang - displayName: osx-clang - condition: succeeded() - pool: - vmImage: macOS-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - export CC=clang - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'osx-clang' - platform: macOS - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: osx_gcc - displayName: osx-gcc - condition: succeeded() - pool: - vmImage: macOS-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - ci/install-dependencies.sh || exit 1 - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'osx-gcc' - platform: macOS - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: gettext_poison - displayName: GETTEXT_POISON - condition: succeeded() - pool: - vmImage: ubuntu-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - sudo apt-get update && - sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev && - - export jobname=GETTEXT_POISON || exit 1 - - ci/run-build-and-tests.sh || { - ci/print-test-failures.sh - exit 1 - } - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-build-and-tests.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'gettext-poison' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: linux32 - displayName: Linux32 - condition: succeeded() - pool: - vmImage: ubuntu-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - res=0 - sudo AGENT_OS="$AGENT_OS" BUILD_BUILDNUMBER="$BUILD_BUILDNUMBER" BUILD_REPOSITORY_URI="$BUILD_REPOSITORY_URI" BUILD_SOURCEBRANCH="$BUILD_SOURCEBRANCH" BUILD_SOURCEVERSION="$BUILD_SOURCEVERSION" SYSTEM_PHASENAME="$SYSTEM_PHASENAME" SYSTEM_TASKDEFINITIONSURI="$SYSTEM_TASKDEFINITIONSURI" SYSTEM_TEAMPROJECT="$SYSTEM_TEAMPROJECT" CC=$CC MAKEFLAGS="$MAKEFLAGS" jobname=Linux32 bash -lxc ci/run-docker.sh || res=1 - - sudo chmod a+r t/out/TEST-*.xml - test ! -d t/failed-test-artifacts || sudo chmod a+r t/failed-test-artifacts - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || res=1 - exit $res - displayName: 'jobname=Linux32 ci/run-docker.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - - task: PublishTestResults@2 - displayName: 'Publish Test Results **/TEST-*.xml' - inputs: - mergeTestResults: true - testRunTitle: 'linux32' - platform: Linux - publishRunAttachments: false - condition: succeededOrFailed() - - task: PublishBuildArtifacts@1 - displayName: 'Publish trash directories of failed tests' - condition: failed() - inputs: - PathtoPublish: t/failed-test-artifacts - ArtifactName: failed-test-artifacts - -- job: static_analysis - displayName: StaticAnalysis - condition: succeeded() - pool: - vmImage: ubuntu-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - sudo apt-get update && - sudo apt-get install -y coccinelle libcurl4-openssl-dev libssl-dev libexpat-dev gettext && - - export jobname=StaticAnalysis && - - ci/run-static-analysis.sh || exit 1 - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/run-static-analysis.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) - -- job: documentation - displayName: Documentation - condition: succeeded() - pool: - vmImage: ubuntu-latest - steps: - - bash: | - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1 - - sudo apt-get update && - sudo apt-get install -y asciidoc xmlto asciidoctor docbook-xsl-ns && - - export ALREADY_HAVE_ASCIIDOCTOR=yes. && - export jobname=Documentation && - - ci/test-documentation.sh || exit 1 - - test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1 - displayName: 'ci/test-documentation.sh' - env: - GITFILESHAREPWD: $(gitfileshare.pwd) From patchwork Wed Apr 8 04:05:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479299 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1B6E31894 for ; Wed, 8 Apr 2020 04:06:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F05CB2078C for ; Wed, 8 Apr 2020 04:06:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Es8v8RWI" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726566AbgDHEGR (ORCPT ); Wed, 8 Apr 2020 00:06:17 -0400 Received: from mail-pl1-f178.google.com ([209.85.214.178]:39065 "EHLO mail-pl1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726541AbgDHEGQ (ORCPT ); Wed, 8 Apr 2020 00:06:16 -0400 Received: by mail-pl1-f178.google.com with SMTP id k18so2051735pll.6 for ; Tue, 07 Apr 2020 21:06:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QN7Q64j4a1PYWo6C9YjXPJpU6Un4mqbMkX33ke115aM=; b=Es8v8RWIwddC2UlIyymvPVYFNgFRe7IGpVx438WLD0X3JDo49Ju4Im31HEfST0XkNJ 5wjbl4zrbxMI2fXIJIykmRHRLK6D3N5+M1e6aar/+UCr//X5HJjbjpnCsincerFnQFhc o23U/ijZy3KhtcxlhT0peFiDmd2Bg+7xV1CIZ6LGnT7pncygT/23Rz3R7RXoS8CFzqz4 0QVeWwSx4In5fj/iQU7v4mrlpnpo6KethxgHl/7/t03Noh3QaSYKBzhGO+FZ1EIoHBew zyM/ykvOaWquxDNPiL87al5mMdRoGk7k4qXgqeyXLOVghwgCpH+aVV6IUWEvRbL6F/k9 eMjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QN7Q64j4a1PYWo6C9YjXPJpU6Un4mqbMkX33ke115aM=; b=N2NVntHtLSH0ilCWfVASfdx+WIBiPdnmUaRjkkb6JUlfg1b7BSCby7ncS6lX/LN7WU F5+lGqA7fUQCX29Js68UgdK+91GvCYk5NJjv9x+kgwyZQd+lzpvjwN5LAQ4WUveaQtDa cP2+KZ2j2uCv73JVlBh251z6ErZOkPwG0JMVIDsSd2T1pQPlm8sLfdGIu80/r8g46tay rFafaVyFE8Xau5wWkBrI/k6gR9cHmfXScPgE6P2F9KuIEmd0wOve7+mXEuWtVE3PhBUo wlPhqQnIZhEo0n/VgRfdoiOvsNM1TAQjPybr/u1e2Hjb0syP1s6tTYwJK7OJdWFoxv8e 2zzg== X-Gm-Message-State: AGi0PubWwf3IHzxCN9OhWhB1PSuF8pruZG1WKQ0FOc38oajQ03cW/LBl VXf2YcxBPnZpZQJ4hTvcaix/+vQxleo= X-Google-Smtp-Source: APiQypLCMtPIXNKTpWlcv82eNDxnqjPsExEQwYiev1YSvDqOutN0tyGpVmSXfjtm0j9KguriAhWteg== X-Received: by 2002:a17:902:9b90:: with SMTP id y16mr4450307plp.227.1586318774822; Tue, 07 Apr 2020 21:06:14 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:14 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 10/12] tests: when run in Bash, annotate test failures with file name/line number Date: Wed, 8 Apr 2020 11:05:41 +0700 Message-Id: X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin When a test fails, it is nice to see where the corresponding code lives in the worktree. Sadly, it seems that only Bash allows us to infer this information. Let's do it when we detect that we're running in a Bash. This will come in handy in the next commit, where we teach the GitHub Actions workflow to annotate failed test runs with this information. Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- t/test-lib.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index 0ea1e5a05e..40a00983f7 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -657,6 +657,18 @@ die () { fi } +file_lineno () { + test -z "$GIT_TEST_FRAMEWORK_SELFTEST" && test -n "$BASH" || return 0 + local i + for i in ${!BASH_SOURCE[*]} + do + case $i,"${BASH_SOURCE[$i]##*/}" in + 0,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:$LINENO: ${1+$1: }"; return;; + *,t[0-9]*.sh) echo "t/${BASH_SOURCE[$i]}:${BASH_LINENO[$(($i-1))]}: ${1+$1: }"; return;; + esac + done +} + GIT_EXIT_OK= trap 'die' EXIT # Disable '-x' tracing, because with some shells, notably dash, it @@ -702,7 +714,7 @@ test_failure_ () { write_junit_xml_testcase "$1" " $junit_insert" fi test_failure=$(($test_failure + 1)) - say_color error "not ok $test_count - $1" + say_color error "$(file_lineno error)not ok $test_count - $1" shift printf '%s\n' "$*" | sed -e 's/^/# /' test "$immediate" = "" || { finalize_junit_xml; GIT_EXIT_OK=t; exit 1; } From patchwork Wed Apr 8 04:05:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479303 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EE0D21392 for ; Wed, 8 Apr 2020 04:06:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC8FF20747 for ; Wed, 8 Apr 2020 04:06:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Pa2GgXNp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726575AbgDHEGU (ORCPT ); Wed, 8 Apr 2020 00:06:20 -0400 Received: from mail-pj1-f48.google.com ([209.85.216.48]:34494 "EHLO mail-pj1-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726559AbgDHEGR (ORCPT ); Wed, 8 Apr 2020 00:06:17 -0400 Received: by mail-pj1-f48.google.com with SMTP id q16so1772657pje.1 for ; Tue, 07 Apr 2020 21:06:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2s8YeHubB8Som9HdzP1bglEbIaOh+D+1TDY/7CiVOUI=; b=Pa2GgXNpOQAwDKiJh7+wFPqW0QuSA5BdfP2JUOd6IOb9hsZQQ8+Q8URdoznIZRh6dE GSE7CNj8fvQpCPrvA8VgFgUeAgSQXfciX5Q0lb5Jg302Uap+k9CIon7QJ9+dNXZO56Hh Ysm/s6Ir2t9aCIfyP6GOW8VKxQqVYQvn9qEoYaumHJ1IsS1Mn63L9vFdyj0vGkZUmFIX ZB3z5JqoMqi5ZuWeGpUdNUY1dbGlyGHgxg6I1afuX8s6vMx6ETGeTILancjMfnNV+NDu QSzc7BdXwFxEcsfuVeOFxrNBH+erT05gB9nlvIKLkL/cBm3+hMqXWaVm6du1Os2NWyja fE7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2s8YeHubB8Som9HdzP1bglEbIaOh+D+1TDY/7CiVOUI=; b=cP1xeNxBwMyz+N5WSkF7sAM6/0R7++/6ZBDXfWJ88WP/fyV4GISY3UG1ckswIc7lDX LVb7acq4H/fZyrQT0MYlganWAelc/ao90mG5YfZLcZTsWd1vjq6jm+v7Qo5JMfhcB8CW KO7VOzHrIgiGSKyQndnfprUVALQZ5JH7GoP8yvu257jjS3D1vTi+LggfMdYWb9CwsGZX Gax4r2kp5fr6cvoSlMlPJ3bVCWaass8Ubzd5Vge5MiI1ZMcZ+0ng2GqbFBkrbAUZNkjl xdbFike3tYf1qA481qwfMT99WzbrFe/maLSmyxwLAUb0sF78m4m3Cc8ifBq15jJ6Ty1v uzZQ== X-Gm-Message-State: AGi0PuY6BY4MgkphJv0g0Mepbtr3XpQggfrXwGJu8lkZ4AMbmZRzhKpZ sbDKIQNNL981m5fekbucuPVKm2FtCl8= X-Google-Smtp-Source: APiQypJmg7AL7OkitRDDsqUmBjjasPBD42wd55wqsgcfXsXJpMI2WDLGVl6tvhaYqzfoFnEe8uy1bg== X-Received: by 2002:a17:90a:be0b:: with SMTP id a11mr3084521pjs.56.1586318776460; Tue, 07 Apr 2020 21:06:16 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:16 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 11/12] ci: add a problem matcher for GitHub Actions Date: Wed, 8 Apr 2020 11:05:42 +0700 Message-Id: <715d1f732fd9ee475dd18d28f1b0801abe223d8c.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin With this patch, test failures will be annotated with a helpful, clickable message in GitHub Actions. For details, see https://github.com/actions/toolkit/blob/master/docs/problem-matchers.md Note: we need to set `TEST_SHELL_PATH` to Bash so that the problem matcher is fed a file and line number for each test failure. Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- ci/git-problem-matcher.json | 16 ++++++++++++++++ ci/lib.sh | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 ci/git-problem-matcher.json diff --git a/ci/git-problem-matcher.json b/ci/git-problem-matcher.json new file mode 100644 index 0000000000..506dfbd97f --- /dev/null +++ b/ci/git-problem-matcher.json @@ -0,0 +1,16 @@ +{ + "problemMatcher": [ + { + "owner": "git-test-suite", + "pattern": [ + { + "regexp": "^([^ :]+\\.sh):(\\d+): (error|warning|info):\\s+(.*)$", + "file": 1, + "line": 2, + "severity": 3, + "message": 4 + } + ] + } + ] +} diff --git a/ci/lib.sh b/ci/lib.sh index 8b39624f3c..4c54540fa8 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -157,6 +157,11 @@ then MAKEFLAGS="$MAKEFLAGS --jobs=10" test windows != "$CI_OS_NAME" || GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS" + + # https://github.com/actions/toolkit/blob/master/docs/commands.md#problem-matchers + echo "::add-matcher::ci/git-problem-matcher.json" + test linux-musl = "$jobname" || + MAKEFLAGS="$MAKEFLAGS TEST_SHELL_PATH=/bin/sh" else echo "Could not identify CI type" >&2 env >&2 From patchwork Wed Apr 8 04:05:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11479301 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D464A1392 for ; Wed, 8 Apr 2020 04:06:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B19132074F for ; Wed, 8 Apr 2020 04:06:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="rjofB4kg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726582AbgDHEGV (ORCPT ); Wed, 8 Apr 2020 00:06:21 -0400 Received: from mail-pj1-f41.google.com ([209.85.216.41]:40919 "EHLO mail-pj1-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726541AbgDHEGT (ORCPT ); Wed, 8 Apr 2020 00:06:19 -0400 Received: by mail-pj1-f41.google.com with SMTP id kx8so639508pjb.5 for ; Tue, 07 Apr 2020 21:06:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dGE3C35uALGSi+jQbWFuezr9Lt/mGlPAfYT4Loyh9KU=; b=rjofB4kgydZ+5tCR8TUHmOQ2aZVDkb0Lsig7G3P8jdjBgLX1y2v52rHgepmNRMb++t phhfjUCdf+/5yVW6pEcbb+MzFmOrDOBn+0XZEsP6CVfj5zLt0Nk0TH+AZ+Cph8wBBi+s aec81oBIEH42FXeDtTGQhR7IhCw2GZEtcbh8vZpJn5odz53RF6RDjv5Calk1qfp4ASFR TUjFVI8tChdQLxYOayDPT2gw649P0PfJzflCac5tqIS7fdJrzBzMtYTrFkD9ySwvoLFi YVdD480yxdAm9Ic7cyd7+0IOXa2KS9KAlYSHu6yCgBbHg9Uiy6MWl/KjsyYBFVPL2GsS L6Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dGE3C35uALGSi+jQbWFuezr9Lt/mGlPAfYT4Loyh9KU=; b=ZaVAf24JnvDPpllyLGFdDIJDyD1uVbefHBTr72AoPPhrZMYru7d90rP/PhEMJNDDZB zTUiObRHlr/AYbZsBGecTNviIa65PK498erz/3hgd/ci1qfiSKCYAwkAI8VswgkH7H5e ddmyPlarh5JDR/ZZ/cyjnBs/TouO2fNBMT2IlTND8+UF9m19a6Lg430a6HoBhOgZInsf sMpVy9068lv8z4XOGWAwJyT07A0PwVknLRTOQ/h1aMhdBKq4dIgo7G46GWZV9ku9B2vX LEv6VpixC+tYl2sadpip/gssqlOgidD8o6+M3U9V1/o874TWR5M69I+QKtOxEOzWybK4 leWw== X-Gm-Message-State: AGi0PuYuEaJ/3STzP3SCd9ZVpVsD6zR2MorbBFBjMP2uyQSMIuopnUjN nQsyz/AmW2wqizdOpJWHc+M4akDiYx4= X-Google-Smtp-Source: APiQypJQZS5s/sU3Rh872Dx2D1FkkZvGpFMOvP2d6sp2nw6rVKkKgQyUkcmYKPdiOOPBXCc7WhRmsg== X-Received: by 2002:a17:90a:34e:: with SMTP id 14mr3090252pjf.32.1586318778321; Tue, 07 Apr 2020 21:06:18 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s9sm2879725pjr.5.2020.04.07.21.06.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2020 21:06:17 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: Johannes Schindelin , =?utf-8?b?xJBvw6BuIFRy?= =?utf-8?b?4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v4 12/12] ci: let GitHub Actions upload failed tests' directories Date: Wed, 8 Apr 2020 11:05:43 +0700 Message-Id: <0908d5ab9beb0e549bec8637f4d0e4ba1f85204d.1586309211.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.26.0.334.g6536db25bb In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin Arguably, CI builds' most important task is to not only identify regressions, but to make it as easy as possible to investigate what went wrong. In that light, we will want to provide users with a way to inspect the tests' output as well as the corresponding directories. This commit adds build steps that are only executed when tests failed, uploading the relevant information as build artifacts. These artifacts can then be downloaded by interested parties to diagnose the failures more efficiently. Signed-off-by: Johannes Schindelin Signed-off-by: Đoàn Trần Công Danh --- .github/workflows/main.yml | 18 ++++++++++++++++++ ci/print-test-failures.sh | 7 +++++++ 2 files changed, 25 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e1ac6d23b4..fd4df939b5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -63,6 +63,12 @@ jobs: shell: powershell run: | & .\git-sdk-64-minimal\usr\bin\bash.exe -lc ci/print-test-failures.sh + - name: Upload failed tests' directories + if: failure() && env.FAILED_TEST_ARTIFACTS != '' + uses: actions/upload-artifact@v1 + with: + name: failed-tests-windows + path: ${{env.FAILED_TEST_ARTIFACTS}} vs-build: env: MSYSTEM: MINGW64 @@ -176,6 +182,12 @@ jobs: - run: ci/run-build-and-tests.sh - run: ci/print-test-failures.sh if: failure() + - name: Upload failed tests' directories + if: failure() && env.FAILED_TEST_ARTIFACTS != '' + uses: actions/upload-artifact@v1 + with: + name: failed-tests-${{matrix.vector.jobname}} + path: ${{env.FAILED_TEST_ARTIFACTS}} dockerized: strategy: matrix: @@ -194,6 +206,12 @@ jobs: - run: ci/run-build-and-tests.sh - run: ci/print-test-failures.sh if: failure() + - name: Upload failed tests' directories + if: failure() && env.FAILED_TEST_ARTIFACTS != '' + uses: actions/upload-artifact@v1 + with: + name: failed-tests-${{matrix.vector.jobname}} + path: ${{env.FAILED_TEST_ARTIFACTS}} static-analysis: env: jobname: StaticAnalysis diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh index e688a26f0d..92a983a265 100755 --- a/ci/print-test-failures.sh +++ b/ci/print-test-failures.sh @@ -46,6 +46,13 @@ do mv "$trash_dir" failed-test-artifacts continue ;; + github-actions) + mkdir -p failed-test-artifacts + echo "::set-env name=FAILED_TEST_ARTIFACTS::t/failed-test-artifacts" + cp "${TEST_EXIT%.exit}.out" failed-test-artifacts/ + tar czf failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir" + continue + ;; *) echo "Unhandled CI type: $CI_TYPE" >&2 exit 1