From patchwork Fri Apr 10 17:18:03 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: 11483485 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 CDE8E17D4 for ; Fri, 10 Apr 2020 17:18:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ADDCD20936 for ; Fri, 10 Apr 2020 17:18:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lQKpOV35" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726669AbgDJRSY (ORCPT ); Fri, 10 Apr 2020 13:18:24 -0400 Received: from mail-pl1-f178.google.com ([209.85.214.178]:34647 "EHLO mail-pl1-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726181AbgDJRSX (ORCPT ); Fri, 10 Apr 2020 13:18:23 -0400 Received: by mail-pl1-f178.google.com with SMTP id a23so861980plm.1 for ; Fri, 10 Apr 2020 10:18:23 -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=lQKpOV35E9S+z8D9n0GuQapQotOKLLSJdLGfJ2bZ+RiiVdCEM9zx6XObCrGBDMnqow as3p5FjUue+VSmJKadl1CO6xkrnHICDfQzHE14slwb2UiOGX/fveoz5osMkFXRFVXfB1 0O1opI7W/OXBbPZ93ai49BiwAX3L/0jU+uyaH0nsZ7xmSHREuvNZVSEG8wWo9LxlOZhS L7EF6C9jrcsF6fzlqidpWHAt3srVXx8THEZisG0jV9eGivB/4ZbRm80Sb9Pj9nFVzjYz zxFJulamnzkxQmoBHyl1jN0rlyvEK0op1jLew2+vP1WvUlaO2MC319YdYjcjvWeYXFEk l8UQ== 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=PgzZMA3yjqeq65M9sUaTkzs/TpUTiL3UFAarMIWmSGCMBvqIk5/TPP+k3CfAH+L1Nk UBGnZ341r0OUcqwJ+W36tYZuorW2YeYJa+Tk152dcXS1n87Ppl89K424vCIe57xFqJrp R7ACpcJer88dCaMIBW+wGxGyni7oOGdLvSSILeCq/jUK7J0f6ffi/PUiuJ4CAKR+xd8P yZMwEiTvTf+gcnPymV3XyT3ktNh7wjN9x630wb09n4H4QLKeNP7NYk+7Xx+vmy/edCnV 8rJeNBYskx2aXBi0O+B9Uxol0dcs+rLcQJZBWEH6qJi/oJ6X/CaFDhfBpwaGyiE8jdyj UC4A== X-Gm-Message-State: AGi0PuZb3ceEeHfd6HRe/xLeLzfU6TmFnw5+p280EM5xP8HoTpv2NvC0 JKRDT8F0FdjwlOQIajHR+NAQ/0nc X-Google-Smtp-Source: APiQypKK6mJuZk6g7YdnQE2qH/E289NTul7cFg2p8vmaChtc7AEu0KsBe3Bhr/lJyBw5VRv+9kqDWA== X-Received: by 2002:a17:90a:290a:: with SMTP id g10mr6451777pjd.81.1586539103043; Fri, 10 Apr 2020 10:18:23 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:22 -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 v5 01/12] ci/lib: if CI type is unknown, show the environment variables Date: Sat, 11 Apr 2020 00:18:03 +0700 Message-Id: <2219bf3db9e247f5f4fb5d518f22709909d57a1c.1586538752.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 Fri Apr 10 17:18:04 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: 11483491 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 70FA581 for ; Fri, 10 Apr 2020 17:18:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5244E20936 for ; Fri, 10 Apr 2020 17:18:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P1aDkdWh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726695AbgDJRS3 (ORCPT ); Fri, 10 Apr 2020 13:18:29 -0400 Received: from mail-pj1-f65.google.com ([209.85.216.65]:53171 "EHLO mail-pj1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726181AbgDJRS1 (ORCPT ); Fri, 10 Apr 2020 13:18:27 -0400 Received: by mail-pj1-f65.google.com with SMTP id ng8so1004885pjb.2 for ; Fri, 10 Apr 2020 10:18:26 -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=P1aDkdWhimy4BXSs/PbSKN5w3iigXF0cpsXm0mE3ATu5fzXmqEgAfyKdXUOA3V+YwZ rEo24tWJybrEhRJA/OOlSaG2sKdwwLCkbWbvjv6aa7QLDbGOjNyCHpzquhGtuR0YmBbX UN44YHoA9x0sa+3ItWen22CljD3LKS6PvMhVnne8bJJTuRLeDtMOu6g8ngxgjXBfz5lo rWeIZnfvTqnNVDC8gS0Re1KRQw4HLMmMcTrjNmb3iX9uuK/tCLD6F86LyHfIvv6wpom3 XUT3QVt5ywb9t2qHAPEtzVeBZpFO8fnMn7c5EK0AYk+0PgKTGGx/MdsBojd4DjRYuVVu Af4w== 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=ndoaFmsSTaJI5rec6ByQ7tgAzd06P+QGFPqvh/3zCaOB0qCOJ5rjb2usofv5ac15wP nYp4mf0lkBjRYuOmjbKL2vDBycp+3lUDhnayEnjtQdTl8SnZvfnmgJFqtBtweAH5GUHY atpDi41nJmeKqQaWXR7OVFMmWz3KnauFjnBG1LmIqjC7xkHp7snUy56JaglHOJrAOt9v Cd0dB4t39bMES8zqGCrbNA3bMZ/ArD88+GXL7O80bdnrnNtf/7HFitZBztISUBdpxTww cm/7xflCs1yPOj764yIPrOAnx4mdUI45XSItlwCPDahIlJ/Hdd7JUokJDk0tAwBiotbd fFhw== X-Gm-Message-State: AGi0PubJc9g/hK/E9QPeOhtKqTgWoIDysebPjYOLb1fSpRVifVWZ8DXY KLqgFiaG+wzb+VaWxseKiytHl3+h X-Google-Smtp-Source: APiQypIoL12km9Ag2TMJb2N+4u/rtUWCEQG9VDIHD0QDVaMkaUPn0CwKkJW7NAo/FUR+6vmC7G04Tg== X-Received: by 2002:a17:90a:e7d0:: with SMTP id kb16mr5944052pjb.97.1586539104792; Fri, 10 Apr 2020 10:18:24 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:24 -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 v5 02/12] ci/lib: allow running in GitHub Actions Date: Sat, 11 Apr 2020 00:18:04 +0700 Message-Id: <2818799a4b135db019ac48c59b25032f8cd291ad.1586538752.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 Fri Apr 10 17:18:05 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: 11483489 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 B55E881 for ; Fri, 10 Apr 2020 17:18:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 95F2A214D8 for ; Fri, 10 Apr 2020 17:18:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="h8C5tRED" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726701AbgDJRS3 (ORCPT ); Fri, 10 Apr 2020 13:18:29 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:35320 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726690AbgDJRS2 (ORCPT ); Fri, 10 Apr 2020 13:18:28 -0400 Received: by mail-pf1-f193.google.com with SMTP id a13so1295447pfa.2 for ; Fri, 10 Apr 2020 10:18:27 -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=h8C5tREDl6F+K2YJrDWr4hDbBcY2IYHcJrCKPgpz2QPWZkeox8ToS4BFeUl1/kFBMt JU5lYxJmhra8dZgThnuLL0mwbn/G7fZdefU1hKl59HxCRNnYiL7qSTe2qHUN92B1JoEw IcTfHxlMUwRyj6iXE4fx0s8hWB3YCFHu0Dem0txp3Ia4N7HZ6M+F47WMLWLV2zYyhGGM 8z+kLf4WmKXofeHutL+0FPwIuoQeSpebfRvycrqtU885XVrFo1guym3B698D2Bzubm6c kGhq2VYhvuzQYCZzMLfGSh8pxZ+JPAW6V6X1XUvKURc/XApoubJ8hL08CzCmAZSSzrwu 76jQ== 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=hKYKIltmPjm1T3fZhYWI6T6X9Q7rEz3Jd/UjXvMdGkyHe2+GV2toWlEhQPSQLfRJYM rLJLD9HAFhialx6nXam1H2/4c+sWpu8M1Za61kmkmGqkdNZ8lrUF6UYIcj1emhH51bO0 6Fm3mWpgC9OfXg06XH7TnXXSq/6rCmE1pWI5tlzir7dniGEY1fKeE1dGyhMF4RlJEg3n LdNf2kKY5wxAmcZpr6OLGhMb174emA8743iqRhtwrkXZStcF2ikQZ8cUDkLGSFJv4GDj KLkw8y1/0ZFTQ5V5q2O43W0qXCkC+hWegLneRkyIL+oXTtIQOLplfhdXB9V8kl6PrdTA 0PnA== X-Gm-Message-State: AGi0PuYmXiTh9yZGQLHdm+5oPCy/yHdQ9IJ7ihJor1W+R2IGNKD4io7K P8cBUB5skZVFbuwujj53I3OaCzGk X-Google-Smtp-Source: APiQypIshdNbAeQTQlP2yxCHtRH93i1kLJmS2XGw83LGhDaTLUEKWHYJe2TrY4GNB4UZagyr8FOoEA== X-Received: by 2002:a63:a07:: with SMTP id 7mr5236614pgk.261.1586539106338; Fri, 10 Apr 2020 10:18:26 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.25 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:25 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v5 03/12] ci/lib: set TERM environment variable if not exist Date: Sat, 11 Apr 2020 00:18:05 +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 Fri Apr 10 17:18:06 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: 11483495 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 6EBCF17D4 for ; Fri, 10 Apr 2020 17:18:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50B7F2145D for ; Fri, 10 Apr 2020 17:18:33 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VMoiA6Ti" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726713AbgDJRSc (ORCPT ); Fri, 10 Apr 2020 13:18:32 -0400 Received: from mail-pl1-f194.google.com ([209.85.214.194]:45693 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726690AbgDJRSa (ORCPT ); Fri, 10 Apr 2020 13:18:30 -0400 Received: by mail-pl1-f194.google.com with SMTP id t4so841198plq.12 for ; Fri, 10 Apr 2020 10:18:28 -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=VMoiA6TiBQBjAj/lOnOE9tngknDLpjKT65FaeHWnlugbfDg1CgXjHuJC8w4ge3FNPs VVTsDAFIh+romh4BkDXdGeJaDfdsuZOE6ED9qDkhz8mZzHYgMg8Lmp1XJZg8EyzkhwzW tYZlqqGNGh43h2pMAVDrBoO5VTjYcbRtpfEiqe3YG5z5OreWRqcbXYNxPzRwOXrb5Fay w7rEIlImNBtAYhR5JRDC0DjGvknmJZcNg4lbfqA/7G7Za02DFjvECh3cjR02otzrgD+7 leFS2/GTcYxc0+zZqXAY+OW2v7YLKuvpBob2Jw1ZjOLftzlDUI6RETugmT18FJFbJWoc O27A== 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=aj5anBKuhKcm0zt6yXyDOSNA68FUbdTPIukSQDB9g9puF0qZIOM4KX7pmRjhQ1y8Se imHketw6YMbvIHlge4K9ztxFy8B2YUFAIjjTeu9bsh7slZvN2p+fuzc5jpsmrdGGPgna KGnZfoXbZNpK1riF8ydWZtulgEl/LlXpUcZAmktzhsP7T+5p+Fdxb1CGITiDw+Ddm26h DOkZDh7DWcESvNaDp8FGbOAAnvZIwEB6XCDGo4cKUCtGWk7RGYzBD5dm2+RN8wBywBMQ AhMV89UEvFSIuYOXKqQavbXAm0o0ncP6KrqZy2qrk4HjcJKO78IYgSHn6fw/jDvIbJS1 xgdw== X-Gm-Message-State: AGi0PuaW5bsNeSFfm9Z0FsT9QQ+qejWTmwjPxV4Ill5YLlkeamr1KcsF L05ncBrvvrDAPZUym39SWGraLKkB X-Google-Smtp-Source: APiQypI/6o4T42xiQ0A8DwH3RLaZ8pVFiSXhL3vxU5gzyUsSk4w/ejkkNERj+c6TUxdmrfzp7Z5Mew== X-Received: by 2002:a17:902:bd45:: with SMTP id b5mr5370911plx.185.1586539108036; Fri, 10 Apr 2020 10:18:28 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:27 -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 v5 04/12] ci: fix the `jobname` of the `GETTEXT_POISON` job Date: Sat, 11 Apr 2020 00:18:06 +0700 Message-Id: <1df60e677c0b98b010c74914ab49f32a544bc59f.1586538752.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 Fri Apr 10 17:18:07 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: 11483493 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 1232281 for ; Fri, 10 Apr 2020 17:18:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E82C02145D for ; Fri, 10 Apr 2020 17:18:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Paes4l0O" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726708AbgDJRSb (ORCPT ); Fri, 10 Apr 2020 13:18:31 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:33928 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726703AbgDJRSa (ORCPT ); Fri, 10 Apr 2020 13:18:30 -0400 Received: by mail-pg1-f194.google.com with SMTP id l14so1242473pgb.1 for ; Fri, 10 Apr 2020 10:18:30 -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=sqyGoNd6vKMDymYnCsPPlXj+sY4+ST795M7cOeTa6VI=; b=Paes4l0OlXHGLmp8aS5vVa8pj6bMzmrNtreIVO60gfKUmJ0ZqmC81FCO/x8LqHQyv3 WK9FKewr5vA9KISwm8HkT1zDXLWsN5ddgj2dwjVMcp9Gl2KRpDnsGRbKWjhSAgYhjt1+ wWPhq1LIXYWS5+Vxko2kwggTrm0DUFJITt90Xum2oB8vuAO8XVqqiA8ka7yJzQbFrvfO cXJqHZ5TDvV6bHGPBnt5478F8cFlQF2avaCDUXwDFG6iAn2nZ5oJ0SA4ftxlz9CZSRDY FyGnvTbIYa5rnYF3QDZVja0keBbJWDzpffkLtGjBo3E6bpyonomcadeoxaHRanCyxkvM H8Iw== 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=sqyGoNd6vKMDymYnCsPPlXj+sY4+ST795M7cOeTa6VI=; b=qzIVGZeaQWj/sdwWY0oNdBKL95lu6Z5AIDBHX/VJCfyrCFejd6fEMt0V1+Yn6sbiyR jsC2XQBJP4tgJKmEu41TP0V8wv5AquGiV1pHUK3uZRoNBCI8bDyw6TmK/34Ib2eME0uw WsyF4wi2Q0o3lUp6uGu5itHZ3UyJul+T7MXegw0SmKJ0vmdd/bzPJ4MtTvlpx2gQ6I8u AVHkBeKkPtXkPS0aFQPMUDjfF2f8uFabc2GX/VI4jQe58rYKYrTcJeQZdXbI3gDlbaIC B7rB7Sd5wrAi6ItPFKs9J5IZA1YjTeseH3rkWKadkX75wpbBzAIafVzYM2aYiY/6eCFu rdbw== X-Gm-Message-State: AGi0PubnT0pXoOmG6tIO211spRQnSyIOKZQS/Jw+dmbLHLgDqcsE/5+i GqFlQEkFm8jycwPShpmCKvewJ+xe X-Google-Smtp-Source: APiQypJz9Em6YSii8hXKbLOj3KoglTGeFP+MvCexysBwPLpFKGwGePTV8dLIsJkM7JkeYQxhxSUR8w== X-Received: by 2002:a63:d40a:: with SMTP id a10mr5242194pgh.53.1586539109675; Fri, 10 Apr 2020 10:18:29 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.28 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:29 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= Subject: [PATCH v5 05/12] ci: explicit install all required packages Date: Sat, 11 Apr 2020 00:18:07 +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 In a later patch, we will support GitHub Action. Explicitly install all of our build dependencies on Linux. Since GitHub Action's Linux VM hasn't installed our build dependencies. 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, 11 insertions(+), 3 deletions(-) diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh index 497fd32ca8..3633a60a1c 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -7,12 +7,16 @@ 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 + tcl tk gettext zlib1g-dev perl-modules liberror-perl 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 @@ -59,15 +63,19 @@ osx-clang|osx-gcc) StaticAnalysis) sudo apt-get -q update sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \ - libexpat-dev gettext + libexpat-dev gettext make ;; 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 make test -n "$ALREADY_HAVE_ASCIIDOCTOR" || gem install --version 1.5.8 asciidoctor ;; +linux-gcc-4.8|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 Fri Apr 10 17:18:08 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: 11483497 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 5970181 for ; Fri, 10 Apr 2020 17:18:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3BA562145D for ; Fri, 10 Apr 2020 17:18:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D366wrBo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726719AbgDJRSf (ORCPT ); Fri, 10 Apr 2020 13:18:35 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:46549 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726707AbgDJRSc (ORCPT ); Fri, 10 Apr 2020 13:18:32 -0400 Received: by mail-pg1-f193.google.com with SMTP id k191so1214102pgc.13 for ; Fri, 10 Apr 2020 10:18:32 -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=nlER27XWxnwvB+mDIpMBWguXrKb0hg83RLymj3cezec=; b=D366wrBo0UYWpHtXVpb+JKpQDU6u54ngLY7Y5oevmjo9VUHwiVP3sI2el+Vva08Med N6UdudeZJEUzQ9/Wq+xPHA0eeaubvzrlc848HmK+8xgvMCgz/zky8DGTFbWDAOLQyNfC L3rJK2XwqKs+M7Iht5o97a3SHFq/EEtYslXc3TWj16x8JJCRaIDpLf8LpujZOolXGmZP ACjBAeUqG6yNidJVEDr8l32TWWy24pAjVUJGBAz/LQL+aOQzL72bTiKIBXaEFGuYpqSY XE9zZoGorrNXYw6hd6C3Dz5SzOKmn0C9lkGFLwJq/Fj4Rq/Myu7uL4eutv0oNwhZaDGN 170A== 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=nlER27XWxnwvB+mDIpMBWguXrKb0hg83RLymj3cezec=; b=bXk0Pc/TDBhoNZKHt6YeA56QE2czMFmuYieNrhuh+edhZ2YLiD9SdN7bByl0qpHcJm CqsR00BXLS0Xr0yQvyQltbUF7IELpgQLaynpj08OvCjtDfxqqb2y7zFU4cAgcFl8+ZHy aGvwsNKC5/x23GG0Vak5FFBig5JY3/UyGk/rvHQKppYKyh0hyp9QFEdimGUQadsjavuX jl94WqgHGknbhucZiylR20usGU96xDO+nm0GehROlLRc79aq63jzWl7cSSqXJO28B9RR PybzO7uhE6A9n8trMMFS/lvKesz6FvjLeBrEZZ/jLB8ua+J+fyxOZeeeIz0gubwIehUq hgow== X-Gm-Message-State: AGi0PuZMbPP2vFmMeS7dt0wZNDV7MMAgEDnmCtkBqpZik8EvN7Bc6V1P Lz/DyihObLAm/sxuzQ7kP4seKnJk X-Google-Smtp-Source: APiQypL0yDdTH0w31DJYR23I/u8mj86emhdqD9nOO4epwRAtMUh2U1tXTjC7D/6PBQDmbUQEKWrt0g== X-Received: by 2002:a63:2014:: with SMTP id g20mr5278503pgg.180.1586539111354; Fri, 10 Apr 2020 10:18:31 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.29 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:30 -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 v5 06/12] ci: run gem with sudo to install asciidoctor Date: Sat, 11 Apr 2020 00:18:08 +0700 Message-Id: <2fb9f2e2f285a2df40ddab3f954b661fcd5da588.1586538752.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 3633a60a1c..0229a77f7d 100755 --- a/ci/install-dependencies.sh +++ b/ci/install-dependencies.sh @@ -70,7 +70,7 @@ Documentation) sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make test -n "$ALREADY_HAVE_ASCIIDOCTOR" || - gem install --version 1.5.8 asciidoctor + sudo gem install --version 1.5.8 asciidoctor ;; linux-gcc-4.8|GETTEXT_POISON) sudo apt-get -q update From patchwork Fri Apr 10 17:18:09 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: 11483499 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 6BE5C81 for ; Fri, 10 Apr 2020 17:18:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3CB4F2087E for ; Fri, 10 Apr 2020 17:18:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XGNg0A/E" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726721AbgDJRSg (ORCPT ); Fri, 10 Apr 2020 13:18:36 -0400 Received: from mail-pg1-f177.google.com ([209.85.215.177]:47084 "EHLO mail-pg1-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726690AbgDJRSg (ORCPT ); Fri, 10 Apr 2020 13:18:36 -0400 Received: by mail-pg1-f177.google.com with SMTP id k191so1214142pgc.13 for ; Fri, 10 Apr 2020 10:18:34 -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=XGNg0A/EcBQuR8IQ30ZAA7tlSo2KIhwWfRaRVkXnd0UPByRwXJr3UffOWBzpTW9aWV sqxuavebHPc2zxFy+0fAEi6KmL8gFM0MOijo6ryojrbk3XrPFButX5DAjcotljdk0JNU jbVF403DFONvHECJJQTImxsVbP4eXhbw4VlOt3r4tgTHTiFWfNqthB969RJpu9/3L1Jg aSO8XhpdQyQtplDAUekxtoGxfsA0fakdQv5rDIFrj7HbUyEo5963cn89Z0t9MBbNy8YE Qa7/1EXDqyrzmLxgcNDRgmwnAQ8FRD4EToeVuDjtD1akvmOvTbxC6b1A6S1fxofNc3NU km5w== 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=fxyrHV4TPa6zDcUFOvjPhiiac56pp0ke0Xt+CJ61UA+RbRVN21sviDMqF8xowqdRRk /ZJctiQdTq1EP2vKdox4NR3j3eSTXisE8th4+qiLsogMoB1Ldla7WDt5QzcahRZwI1IE 67tRUaOxoV8qzRp0mp6s9uoxdLOg9r+j0zqrRAqpsFppVVBvpxsN8Tw56WPR2r6UgHvj L39CHv0H6zFMXh866C8bHGxnNDPgS4RT0Cl8eamjm0Qbx6LUyq7NyP3EZzhikYiDdX1B CAFOmG7dPAal2XKqn8MzzkP37rvT9rB5pCmBu+NjYeGc2TYCm9+vTH4QuQNcTyKFCDq2 aToA== X-Gm-Message-State: AGi0PubGcUXuMrl6JlH2hwwzSG2xDr15TQAyZw5LOrRI/BUYlqcvj4Rj 8/5NB75iN/dXKZrvXMdSM3ejm5de X-Google-Smtp-Source: APiQypKXtn5rYtUguLXhNmwJRCpg2dzpmAnPk9z9eQOh9FdZVe2at3Yrv0GcQy4YVhi8vxt8gSH1Gw== X-Received: by 2002:a63:5853:: with SMTP id i19mr5111261pgm.288.1586539113156; Fri, 10 Apr 2020 10:18:33 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.31 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:32 -0700 (PDT) From: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= To: git@vger.kernel.org Cc: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= , Johannes Schindelin Subject: [PATCH v5 07/12] ci: configure GitHub Actions for CI/PR Date: Sat, 11 Apr 2020 00:18:09 +0700 Message-Id: <40fe4f7e2c34c6997a6824ef0dc6aad7a71a4434.1586538752.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 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 Fri Apr 10 17:18:10 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: 11483501 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 E442B913 for ; Fri, 10 Apr 2020 17:18:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C57062145D for ; Fri, 10 Apr 2020 17:18:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cYEgsjIg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726726AbgDJRSi (ORCPT ); Fri, 10 Apr 2020 13:18:38 -0400 Received: from mail-pf1-f193.google.com ([209.85.210.193]:40489 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726715AbgDJRSf (ORCPT ); Fri, 10 Apr 2020 13:18:35 -0400 Received: by mail-pf1-f193.google.com with SMTP id x3so1024495pfp.7 for ; Fri, 10 Apr 2020 10:18:35 -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=cYEgsjIgXCi8nOq+hxub/z1M5U5FQ9UYGf0QPHCgCoPdvgOlI7IWvCjKE7qrlFX5jG qVIPhn32tAgYMh0nA4UF+vH7KQieH+rMYFe5g/cou3h6cV0vHTHYEabnwKzmK3exy2/b X60WrAALItKMnoqb8qWNwszpog+VEHpgtRfjrvNCXPaEhJcyuGHPDKhJBeu0WmgVGPHJ SjQQ/nUn1QlBloLYXds8wa8XHxf/nle0WgqHkKIhYOwSUGI8bJhGNkvEpCJ9RYk//HJO 3oA9XVuhB3VMT00fhaVU2LDJw2b2+rXRpGSoo9wpRYmXiUOSiDTnZS1NLgJKcYWD+pQZ 2zhg== 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=KnkoVB6Rba+ktJkBVGWIgS7kbEa0tFUTOX/sA9/T6i6u9FjP3cE7RAfDZJNzFecV9X w7DDGisoXWpSEt9skx1dc7/oO22kt9t6/nwEGvgUY9lTZC8L8cDDm6k8nWuU9a+q75+s eIhE5MDdUjXWuQ3+khHnRlxEjKIi5NwVyBLE0XSyJVthaJDWIM2CXykCS8Ni/BW+YNvh TB924rzC98kwXjqV92CV/UiJY0t1Y2xehdMKK1CuyTVcW3gd0QUR9E8+TxCtQFqMlcf7 XrS6alXkwiAh5DiCIzrE7MpydjoBMxiHemxk3mEYLa3JQz8/KCjcuxMmGW5hJo4SMCwB YDzw== X-Gm-Message-State: AGi0Puar6bLDQ2fkWthGtWH9Xw49to6QIGm/qOro8FJGBHmT10YFc/xP 2lPwgSP8LR/0ngKqgmUr+zE4Zq9B X-Google-Smtp-Source: APiQypJ/ZacEk/ug9RSBFRhov+dKalhKGxcJnR7HEOZUFz/pgy7gANoJxcd6ce+GMDI3GOc8wfo20w== X-Received: by 2002:a63:313:: with SMTP id 19mr5339846pgd.360.1586539114846; Fri, 10 Apr 2020 10:18:34 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:34 -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 v5 08/12] README: add a build badge for the GitHub Actions runs Date: Sat, 11 Apr 2020 00:18:10 +0700 Message-Id: <09735fb1de03391cbd1ba1d303623f5142fe5ae0.1586538752.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 Fri Apr 10 17:18:11 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: 11483505 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 3F82381 for ; Fri, 10 Apr 2020 17:18:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 080C820936 for ; Fri, 10 Apr 2020 17:18:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jSJoDv4j" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726741AbgDJRSm (ORCPT ); Fri, 10 Apr 2020 13:18:42 -0400 Received: from mail-pg1-f172.google.com ([209.85.215.172]:41099 "EHLO mail-pg1-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726729AbgDJRSj (ORCPT ); Fri, 10 Apr 2020 13:18:39 -0400 Received: by mail-pg1-f172.google.com with SMTP id m13so1223392pgd.8 for ; Fri, 10 Apr 2020 10:18:38 -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=jSJoDv4j4EDGGXWN9fkZmlakZCjGT0vm5iZ15iQadgqTEfbd6gAxThQj9cnei8Uv2p McgoAHfw2ewjeY33f+HqtvXQOnz53EeOU1KCGJXjFy8aAkS41kid959pt3a00nzrpx5N yypK4NSH4tDQvliooE5dPJ4caoAd2DJVlx+2eltZIVIm1jkPQy1eSpvKH8JhkL/7M5BJ 9WsesiTQS5HLcjl7IfufzFpZCzMWbXbJxXeWhpHcjpy/U5ycxrMZSF3hoayV+ml7lACx qYtXeYjusdfNGt5vuflHLw9eIF1iDPXfHkfJhS6TKCIXPUSgViH+QsuCotus2XG6ZoH/ bRcw== 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=OyBH+RI+GST9Cf9MnB19Krba53HYurD9o89YQW3ZPoXwJ/SlUj1NbVb0c/Stxp9yeA otjFUXxRNDoWiYrPmaIocYiJmWggkdmskaYsFHSRfhyD2ywPnJxiUsv9J+7q6By09Mkk yU6aj9AkOlmfP2FBi17OBDmSO7PlWYCX0Q4raAHznf+bsdmcPXeBEsSsLpUE3xRCv/De W8ven6KUdpBA1CAWQdCqURPSpQhwRjmDtcgkBakF/cBKtCSCWW6n9QjVl7sP6ax4Mig2 xJGUNbMQlzD3dv6W1GuVmhwHZz17pkeVv9OIK3UMf26kx0AsItIu7/ARBp5x6jqE17PZ 0SQw== X-Gm-Message-State: AGi0Pubs4v8Uh7wbpqufxoD1ZdJOuJYJr+z5jQjPoTFSIQgdS028rR4w B5kogT0RU+GFTtaj+zHqvbfd+hJZ X-Google-Smtp-Source: APiQypImdcDpY5pXhkGI2/+osZJtAJ6FM7CIG3O897alQMP5IOdYhXSlubK9p+MH2PJRrDis8es+UA== X-Received: by 2002:aa7:9207:: with SMTP id 7mr5892631pfo.178.1586539116707; Fri, 10 Apr 2020 10:18:36 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:36 -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 v5 09/12] ci: retire the Azure Pipelines definition Date: Sat, 11 Apr 2020 00:18:11 +0700 Message-Id: <575b3afd3cd47dd53530df74a681f11783162e76.1586538752.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 Fri Apr 10 17:18:12 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: 11483503 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 78188913 for ; Fri, 10 Apr 2020 17:18:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A12C20936 for ; Fri, 10 Apr 2020 17:18:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jxQe+rkL" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726752AbgDJRSn (ORCPT ); Fri, 10 Apr 2020 13:18:43 -0400 Received: from mail-pf1-f179.google.com ([209.85.210.179]:38951 "EHLO mail-pf1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726715AbgDJRSj (ORCPT ); Fri, 10 Apr 2020 13:18:39 -0400 Received: by mail-pf1-f179.google.com with SMTP id k15so1286812pfh.6 for ; Fri, 10 Apr 2020 10:18:39 -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=jxQe+rkLRPRW4UhvPRJMSbJAqsdjm6vg4UD7sL53uIYFoftfiNqcguYcYP4MzAyq0K wS9d+lSLTKsBjNTOAaXXicO6UQvam1nhVc8Q8GU6aKViS2yueJYtCCHbv8gbsQM5T78v I8ZDEn/KIiZHfBE5Tk8Hx1sQw/RYv6DN9Dbihk1pU0Xr5MTnhQcjHSmtWGNzQa/EKVQo qsIweH9oru32uXchQQpCnpbJszzaLaOd+tk6kN0982FhcGZIOBKb9wUtS5oxthVJz0IX ADGOw8fhGQAr/NEsrvpkRXdRBlxf/Nb44yAsViaxMdcB/BePw2bKqTTRDOdQ8jvDP0cs fIoA== 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=cdmCq0anorgeVKuA+DDhta67uenK+YOzJ9AIugr1fT4JMvwMUy5VK7idV5sCok0Oa6 iLoneYjmhTrxw4UM0uEFHZGM43LqpiNWLoH4o2mEcGZyM32P8FsUUIwc+51b9F94oAwt izVVUXLvtlHdMgHfhaAlP3SUYY1KlYiTi1tP50Y0U2CxEyOEcEW0EufvUFG5dwCToc/S d+Vu86kq7DL0eEMQMO30+Fdtiug5dMKXBAdETlhGHU1fViKbzrCfdi4y7jT+EHj0Hkz0 YuxZq4DX4hS/Wqx8bDhCE8a2Da0PK5p2VGfqNY5zlORFcKSVHiIOsIKdUqy0iyhpoVje Xqrg== X-Gm-Message-State: AGi0PuZVsQYpB8XRMOoa9rPlC+WIxZFj/rXKuH67KyoaJOIWxdxr1UId +C7OlKEpEERyJN6TBzRzjh/8So1X X-Google-Smtp-Source: APiQypJXNSY8rgVYHqncaHWNPAsnugYo8IEFQs8xZw0c2ti+d4ORnBX/rMhTdgjH9ySmsqgi91+qJw== X-Received: by 2002:a63:3195:: with SMTP id x143mr5422207pgx.326.1586539118631; Fri, 10 Apr 2020 10:18:38 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.36 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:38 -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 v5 10/12] tests: when run in Bash, annotate test failures with file name/line number Date: Sat, 11 Apr 2020 00:18:12 +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 Signed-off-by: Carlo Marcelo Arenas Belón --- 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 Fri Apr 10 17:18:13 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: 11483509 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 E277F913 for ; Fri, 10 Apr 2020 17:18:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C476B20936 for ; Fri, 10 Apr 2020 17:18:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Wz66rFkz" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726736AbgDJRSm (ORCPT ); Fri, 10 Apr 2020 13:18:42 -0400 Received: from mail-pj1-f66.google.com ([209.85.216.66]:39798 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726671AbgDJRSl (ORCPT ); Fri, 10 Apr 2020 13:18:41 -0400 Received: by mail-pj1-f66.google.com with SMTP id o1so135307pjs.4 for ; Fri, 10 Apr 2020 10:18:41 -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=Wz66rFkz2Wkwaa54gw9sdm/UzRcOuaO0AlyX0HFHPnJvk4k3z6D0Mw8DcDo1Xnl8n0 powV4Nko38SCRxQ/AZp838LtIEpjjKrUZlU+S7iG88CPB2/Y05PSGGfl1RcBv6g0lIyk RjWmPWrJuHm+NgaHoa6NgUttIjpgl175FpNE6dlfj1eLRW6dJGNVu+v3eQgS5EH75IOf tUOBnyHs4HyBzbtmgEzEpR6dJectlVrzlogDaVnxRyMZglxyvkeoqeDFefbQq5FsV4x2 XoPZRv1TtA9/jaDmXtQ6oxfHR3MDNuk1ikWij2l/hZg1FQQ7FiWJfr4vOeWR/xh/x+P5 gpIw== 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=M+rBWDX7fJdBW3UO4hr+ZzhebpIJ+yEPum3a4OCbyuzZ9aR6jOHeBLygmeleRP8W8B XZkUfe2fcA+vJQi/RwNro2KY1Jz5glg9PFVhdbpUmrU9NqazfbcD5jn9zLwVvdix2hZB xdo+9fN6gsoI2RvrGoEurEwzXa9uHfnGuQKWTRPaztbwX4RaATthOOX4oXoTMoMSUfN/ Nkse7WXzcLD6Vv0tCWijEqluyqhZ9JKVOlADguWP6J4iZ+Xxst+Ek+j36GzlDon9bglS xBf/9rXUnp6vIzi6NCk6KG9rKo9ROTqMm+ZqS+WW7ESsFACu1lcziWG1+gBYa+kVR8DL bKzA== X-Gm-Message-State: AGi0PuZu+oAe2wiA78ju2bIOcalEffxXzZAcWB1SEFzwSG82AX5YoHSe Bl/0QmdF04nBXC+JEPj2TNxEdxv1 X-Google-Smtp-Source: APiQypLAPcRNgG4oT4dSyVnzFB/InqMsqU5j2bt73VaU1lGDOrMvcB/VNiCstXPvQlwgPTJbHI497w== X-Received: by 2002:a17:902:164:: with SMTP id 91mr5412501plb.207.1586539120447; Fri, 10 Apr 2020 10:18:40 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:39 -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 v5 11/12] ci: add a problem matcher for GitHub Actions Date: Sat, 11 Apr 2020 00:18:13 +0700 Message-Id: <3caeb0b7f44d6f034050e3e1a14ed700e6077659.1586538752.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 Fri Apr 10 17:18:14 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: 11483507 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 B1F8617D4 for ; Fri, 10 Apr 2020 17:18:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 956DD2145D for ; Fri, 10 Apr 2020 17:18:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="DL1HxgYS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726755AbgDJRSo (ORCPT ); Fri, 10 Apr 2020 13:18:44 -0400 Received: from mail-pj1-f66.google.com ([209.85.216.66]:39800 "EHLO mail-pj1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726594AbgDJRSm (ORCPT ); Fri, 10 Apr 2020 13:18:42 -0400 Received: by mail-pj1-f66.google.com with SMTP id o1so135333pjs.4 for ; Fri, 10 Apr 2020 10:18:42 -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=DL1HxgYSbss8wzIOp7YJ+TIZhymIOeURFWKcBdTEQkVn8KdjEYYPxabSik3jJgIZ1A 0O1b2h9tTo7KDgWPCNE4a2A7II7cUKoWzOi03+fVdvdeyt1DBTnHgU5xyGlW1opV+bbV meXG5k3oDtuKBwxzMba0c1L1DkSxwThZ3axqAx2imSo774Ce5XjwjSnHnRyK9HOlhP8g CLIsY5rgssvBWXunHCdkLimujGYXoT+84tYyJaenmDnCrO7+OX78E3Kdvfmt7mwuKlzk FyXV4+OT6qsptOQk76AwUOntYLPgzGGVCFjImOzrbWDoFdc/Bl5iDLDuZpMFOgsBvqsz oH5w== 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=i8z3jO+9Bfjyg6HmO+togYFbTb1Tb4MlBM2C8KS7pk5wmvFm9NG0DRrdceZn1Cfpe9 plqLOu0MMB3ywqz8ZR4qqQXCRkysdE0XrTFMY5y9FfxMFpJZ559DP3/PrOYIkdrvsqsw QOZu91C2pUWYRsgbhBncYZmGjBexYZpqExHkQqvNiJ+MFbEBTgyXX0ZKWHYE5pqtSYvX O0zc4X/yoR0FsuInf60yXDm9ylKd5gzcZ2V9hWZnYw7+2lAQjXu9aZt3vu0awJbnjrL3 J6MleQQaosfs5UjhlHMd7fAxpKmPVLFuTobBvDeIE6022t5EFY3oeqSmxi2rY1g4RSBD 4y9w== X-Gm-Message-State: AGi0PuYN+dQIfnmMuyofDeMKrGdIn4Y3iLmlJ1zhmjDzOlIn1a898DI9 gOW6q0/mgTJRKWn0LcYM0obkrl0U X-Google-Smtp-Source: APiQypJ7CmAu1v6VBT3oRZR0lKnFP/0yzzaTyuk/t6YX+yX/C7qC+d4vvsvQxolyvH2EIi9KK9bEKQ== X-Received: by 2002:a17:90a:d350:: with SMTP id i16mr6480004pjx.121.1586539122188; Fri, 10 Apr 2020 10:18:42 -0700 (PDT) Received: from localhost.localdomain ([2402:800:6375:207b:be21:746a:7a56:9d4d]) by smtp.gmail.com with ESMTPSA id s125sm1972897pgc.12.2020.04.10.10.18.40 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Apr 2020 10:18:41 -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 v5 12/12] ci: let GitHub Actions upload failed tests' directories Date: Sat, 11 Apr 2020 00:18:14 +0700 Message-Id: <8de46ee1c6e0e9cab91008c27f097f6f37ed5ca8.1586538752.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