From patchwork Wed Jun 23 15:24:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12340089 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BEB07C4743C for ; Wed, 23 Jun 2021 15:24:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A48786023E for ; Wed, 23 Jun 2021 15:24:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231374AbhFWP0n (ORCPT ); Wed, 23 Jun 2021 11:26:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231320AbhFWP0j (ORCPT ); Wed, 23 Jun 2021 11:26:39 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A3F4EC061756 for ; Wed, 23 Jun 2021 08:24:20 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id h21-20020a1ccc150000b02901d4d33c5ca0so1611794wmb.3 for ; Wed, 23 Jun 2021 08:24:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=m8btpHLgA3Rf/OV25hUuFbeaBFtQVFpk0jGKkNpZmeA=; b=bhOxuskLvmSEnpYg/9kVxcDP7A9UzVrNSsa02zn/wUMK3WbcVXxLoEU0Ld7ZowjLeL Ss+WyFv+vRH/qTesIp1mlAitHHYVGQXunPphBem9QEDIRoHG9z/0pnv9wJhTLr9Mtejg 0v+mfF1lYtoarGOIlQeWoeAv2mOenifq22/uSpbK3zbyVAxG0kT4oDNUSHNjjdXJmtaF 3zB2CiB1P1DCDOBFbd+NkRfQaU3oRj3OnHdBHosXfK1gjWme8GyqMalSRz3Ccxc87M0G k0QcJGChVbQQO7rdACUILrwMuO0wvqunEh1lBoY88q4Cov36mk/3q7KDZ+ZgAs6NHDT8 0mag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=m8btpHLgA3Rf/OV25hUuFbeaBFtQVFpk0jGKkNpZmeA=; b=JnHy56MXvwHnirSE+XU2zkMpqhcWt+oUmIDbXWrR3Ya6aSC9fmYXHBRaLgMgtyMjfk /iLdDFnWFJvxDiEPXsftN1u/FFzd4fTcLFxgFOrnHgejmrKnj5iYS+95Nxlj/XUGTivy qOb9xMoRaehAd3ExHusEdcnYeXrw8e31x4c5MZlR7nWk2SO5x/dYMrZ6OSQh8sBylQLr wYjyi77L7Ub9Op44BjVS/CohTYfjGjHgVgbzxBOEg/jV6QDLgLM0TBVS4rjclbuLRSnm JZRT59V5U8bWrjV33Q6MzsPSP2EkJDbLkEjG64U671dKfeb62J+I0+rT+k9Kusy03rrq DJSQ== X-Gm-Message-State: AOAM533+AW3NEZaiHrymKs+JBxFR+8s3m5R9NEvd4F30qmicAlIXZ1V9 YdlnhqoRPpSxBce6gstlIvd5K/1/t8U= X-Google-Smtp-Source: ABdhPJxBfL+Y3UpkBVpU1pvupIdYs8f/ODwdj/GbcUz8Jz9GxdEX7C5L++V+hsW78/NBC2pVQI+kYw== X-Received: by 2002:a05:600c:2051:: with SMTP id p17mr271046wmg.35.1624461859219; Wed, 23 Jun 2021 08:24:19 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id e2sm360956wrt.29.2021.06.23.08.24.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:24:18 -0700 (PDT) Message-Id: <8da66c425a13557bd83ec1cddfcf86587da2a8f0.1624461857.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 23 Jun 2021 15:24:11 +0000 Subject: [PATCH 1/6] ci: use the new GitHub Action to download git-sdk-64-minimal Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin In our continuous builds, Windows is the odd cookie that requires a complete development environment to be downloaded because there is no suitable one installed by default on Windows. Side note: technically, there _is_ a development environment present in GitHub Actions' build agents: MSYS2. But it differs from Git for Windows' SDK in subtle points, unfortunately enough so to prevent Git's test suite from running without failures. Traditionally, we support downloading this environment (which we nicknamed `git-sdk-64-minimal`) via a PowerShell scriptlet that accesses the build artifacts of a dedicated Azure Pipeline (which packages a tiny subset of the full Git for Windows SDK, containing just enough to build Git and run its test suite). This PowerShell script is unfortunately not very robust and sometimes fails due to network issues. Of course, we could add code to detect that situation, wait a little, try again, if it fails again wait a little longer, lather, rinse and repeat. Instead of doing all of this in Git's own `.github/workflows/`, though, let's offload this logic to the new GitHub Action at https://github.com/marketplace/actions/setup-git-for-windows-sdk This Action not only downloads and extracts git-sdk-64-minimal _outside_ the worktree (making it no longer necessary to meddle with `.gitignore` or `.git/info/exclude`), it also adds the `bash.exe` to the `PATH` and sets the environment variable `MSYSTEM` (an implementation detail that Git's workflow should never have needed to know about). This allows us to convert all those funny PowerShell tasks that wanted to call git-sdk-64-minimal's `bash.exe`: they all are now regular `bash` scriptlets. This finally lets us get rid of the funny quoting and escaping where we had to pay attention not only to quote and escape the Bash scriptlets properly, but also to add a second level of escaping (with backslashes for double quotes and backticks for dollar signs) to stop PowerShell from doing unintended things. Further, this Action uses a fast caching strategy native to GitHub Actions that should accelerate the download across CI runs: git-sdk-64-minimal is usually updated once per 24h, and needs to be cached only once within that period. Caching it (unfortunately only on a per-branch basis) speeds up the download step, and makes it much more robust at the same time by virtue of accessing a cache location that is closer in the network topology. With this we can drop the home-rolled caching where we try to accelerate the test phase by uploading git-sdk-64-minimal as a workflow artifact after using it to build Git, and then download it as workflow artifact in the test phase. Even better: the `vs-test` job no longer needs to depend on the `windows-build` job. The only reason it depended on it was to ensure that the `git-sdk-64-minimal` workflow artifact was available. Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 103 +++++++------------------------------ 1 file changed, 19 insertions(+), 84 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 73856bafc9..c62766e7b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,43 +82,18 @@ jobs: runs-on: windows-latest steps: - uses: actions/checkout@v1 - - name: download git-sdk-64-minimal - shell: bash - run: | - ## Get artifact - urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds - id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" | - jq -r ".value[] | .id") - download_url="$(curl "$urlbase/$id/artifacts" | - jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')" - curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \ - -o artifacts.zip "$download_url" - - ## Unzip and remove the artifact - unzip artifacts.zip - rm artifacts.zip + - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: build - shell: powershell + shell: bash 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 - "@ + run: ci/make-test-artifacts.sh artifacts - name: upload build artifacts uses: actions/upload-artifact@v1 with: name: windows-artifacts path: artifacts - - name: upload git-sdk-64-minimal - uses: actions/upload-artifact@v1 - with: - name: git-sdk-64-minimal - path: git-sdk-64-minimal windows-test: runs-on: windows-latest needs: [windows-build] @@ -136,25 +111,14 @@ jobs: - name: extract build artifacts shell: bash run: tar xf artifacts.tar.gz - - name: download git-sdk-64-minimal - uses: actions/download-artifact@v1 - with: - name: git-sdk-64-minimal - path: ${{github.workspace}}/git-sdk-64-minimal/ + - uses: git-for-windows/setup-git-for-windows-sdk@v1 - 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 - "@ + shell: bash + run: 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 + shell: bash + run: ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' uses: actions/upload-artifact@v1 @@ -165,27 +129,12 @@ jobs: needs: ci-config if: needs.ci-config.outputs.enabled == 'yes' 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: | - ## Get artifact - urlbase=https://dev.azure.com/git-for-windows/git/_apis/build/builds - id=$(curl "$urlbase?definitions=22&statusFilter=completed&resultFilter=succeeded&\$top=1" | - jq -r ".value[] | .id") - download_url="$(curl "$urlbase/$id/artifacts" | - jq -r '.value[] | select(.name == "git-sdk-64-minimal").resource.downloadUrl')" - curl --connect-timeout 10 --retry 5 --retry-delay 0 --retry-max-time 240 \ - -o artifacts.zip "$download_url" - - ## Unzip and remove the artifact - unzip artifacts.zip - rm artifacts.zip + - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: initialize vcpkg uses: actions/checkout@v2 with: @@ -211,19 +160,17 @@ jobs: shell: bash run: | cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \ - -DMSGFMT_EXE=`pwd`/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON + -DMSGFMT_EXE=C:/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON - name: MSBuild run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142 - name: bundle artifact tar - shell: powershell + shell: bash env: MSVC: 1 VCPKG_ROOT: ${{github.workspace}}\compat\vcbuild\vcpkg run: | - & 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)\" - "@ + 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: @@ -231,18 +178,14 @@ jobs: path: artifacts vs-test: runs-on: windows-latest - needs: [vs-build, windows-build] + needs: vs-build strategy: fail-fast: false matrix: nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] steps: - uses: actions/checkout@v1 - - name: download git-sdk-64-minimal - uses: actions/download-artifact@v1 - with: - name: git-sdk-64-minimal - path: ${{github.workspace}}/git-sdk-64-minimal/ + - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: download build artifacts uses: actions/download-artifact@v1 with: @@ -252,23 +195,15 @@ jobs: shell: bash run: tar xf artifacts.tar.gz - name: test - shell: powershell + shell: bash env: - MSYSTEM: MINGW64 NO_SVN_TESTS: 1 GIT_TEST_SKIP_REBASE_P: 1 - run: | - & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @" - # 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 ${{matrix.nr}} 10 - "@ + run: 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 + shell: bash + run: ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' uses: actions/upload-artifact@v1 From patchwork Wed Jun 23 15:24:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12340087 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A3828C48BE5 for ; Wed, 23 Jun 2021 15:24:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 82EBD60241 for ; Wed, 23 Jun 2021 15:24:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231335AbhFWP0k (ORCPT ); Wed, 23 Jun 2021 11:26:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231319AbhFWP0i (ORCPT ); Wed, 23 Jun 2021 11:26:38 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B6C3C061574 for ; Wed, 23 Jun 2021 08:24:21 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id o22so966403wms.0 for ; Wed, 23 Jun 2021 08:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=lSTXDNWYcAL9DpcFZ+0+bcXl3TPysug+LpauhKfnhnc=; b=OF/13vC4VZ0FLPe333SHUUoizsenZ1e8q44xvPopV6HZL21fL13B65ORdUGE982xzf 848XLcB61xgdqExSUQ7yB/j/HAZBI3+pKEMO1WQcaA3KyCs1jXYOOriWdatCeynoY61w Gg1Hu5x5qXvd03FHfwCoaxP68r+V/LQMXs09XnZhAu9XTT40sr5Ii5vsAW3j0JPfnZDK 24QcTHwS8OgD6S7moM31EaVtFyf0ImXcRffHFgxCK4DdvXS6kv4QUoIIf4WZQ2Ygiulz 2bjjJI1QFOJTZUmAd67ZEYL06DdxDh02sBv8DKEg6CGGm02YH5TsSFRalAEfy3R179lo AwYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=lSTXDNWYcAL9DpcFZ+0+bcXl3TPysug+LpauhKfnhnc=; b=t8f4O8VmnRBYSbOCa+P8pvQDhbk+K7yz5H44v6mBW35xEABK9R9Z25Rj8ro43dkp2h 82LW3cRgHoR4/17I+IgQjb0O3Ufgyzjrfi4ja3bJg9nDgdYQNSjD+zX2NO2ppY1FO124 aV9qNWm8NeFS3Ttqv2RxVh4dAGpnSdW5oFEN0iJuIRf/n2DV8mM180jcg9ffb4OtS3Cl h22vuTCHjt2t97K02CYRPIiRrJFmxpa2MmIz5F28COhzpdQbcUG58TJ0XQkvevoZEj48 NEmlw07sGZTuuu5CUnW4d6nC8RNrVlJQUNrUh4CIp8c5T3GwO20Wv6yxVGSNqIGmdnba LoOA== X-Gm-Message-State: AOAM532bH2Zm3kLgGHwNOX00z6QYb38hcP9rgxIxyXknE6N4InDNv3KQ FUTgYnERIg/r9Kc/1Mwh3MW89FydFTM= X-Google-Smtp-Source: ABdhPJyx7phztc6VP+YAU/5B6eWVZ9AOIClOY8Oe29/TnUWYpk/Pyx2V1BmPgjsabHW87XvudSasWQ== X-Received: by 2002:a7b:ce87:: with SMTP id q7mr11666650wmj.111.1624461859842; Wed, 23 Jun 2021 08:24:19 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id t16sm6630733wmi.2.2021.06.23.08.24.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:24:19 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Wed, 23 Jun 2021 15:24:12 +0000 Subject: [PATCH 2/6] ci (vs-build): use `cmd` to copy the DLLs, not `powershell` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin We use a `.bat` script to copy the DLLs in the `vs-build` job, and those type of scripts are native to CMD, not to PowerShell. Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c62766e7b1..d430c4e0d2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -152,10 +152,8 @@ jobs: - name: add msbuild to PATH uses: microsoft/setup-msbuild@v1 - name: copy dlls to root - shell: powershell - run: | - & compat\vcbuild\vcpkg_copy_dlls.bat release - if (!$?) { exit(1) } + shell: cmd + run: compat\vcbuild\vcpkg_copy_dlls.bat release - name: generate Visual Studio solution shell: bash run: | From patchwork Wed Jun 23 15:24:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12340093 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CC3BEC49EA5 for ; Wed, 23 Jun 2021 15:24:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AFE1E6112D for ; Wed, 23 Jun 2021 15:24:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231389AbhFWP0q (ORCPT ); Wed, 23 Jun 2021 11:26:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231350AbhFWP0l (ORCPT ); Wed, 23 Jun 2021 11:26:41 -0400 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD233C06175F for ; Wed, 23 Jun 2021 08:24:21 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id m3so1902132wms.4 for ; Wed, 23 Jun 2021 08:24:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=L3klJRPQBsUOGiYLOmapQxnaCe2Vx29JCOhSY9CvEtE=; b=gyojfb7ABghch1/cAFlh69Q003A1rvJAPP3MHwdpj0IJtR3wEFDcXVlivnj+AHsHWf SL3faDvJ7ZEPxfFo8Of780X05TkDyD2NJbEEo9y0twYqXOsku9EwjXzvXyd8acUDeNgV As9t2siZJ69WoYAGZUU5Xb5MJnAu5/C092cRDs9b1I4KQRNope639Dk0jr0R2AFMSUZy fCSGTMEODZKfkU/BQYDkdzkp0NneJQt3wwk7GvexvBkqCuIqRKJPoeQngAyywkf3kEn7 UzJsBQ9bEPuVdhAXDdJ9RwslZq1wW7g2KgJjRnxRTdSS9740+6/SFgr8P8Hio0hje69x zmww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=L3klJRPQBsUOGiYLOmapQxnaCe2Vx29JCOhSY9CvEtE=; b=pocNNzZwFeNJphnqA0SlDhj2XIfLHw+NBeL8dFou2TLKKleBn/dDoMU93aYLtXqV3K 8X83eI+zOGS5CLKGdfj/mDZsmnsUzFJhAWtgiAGhEzMiPrcOJZIJhssQMh9Gjh8UWver DVstxnI+nQKShI9bc7N16p/ex/8m5ZFv+3hETNIesh/SpehWVrCuXXyiotrrA8eTMqJ+ JRS7Z3dnCCwy0T8cihwXWV9YTr+UB0dRW47Xot22XyZ/BKh0ZqgWa+eFRTpunFel4BH1 hK7G1jUFmPwuG1D75z7jSfIt4sKI1VWpbCVOah0xT55+X7CCgpThJ9NIV6ZvkJRirWlF 5veQ== X-Gm-Message-State: AOAM530Xp3NgjUKlQAGKFxslsu6ebGGb2DmvcJsfScp9FvB2KCS2cn+x EyIR5gBF6QiM/DtyGYnCqj+NWuQkrG8= X-Google-Smtp-Source: ABdhPJx7ICNWPVJ1B4y8vQnPLYpO0nZM6qgNCZvvl/aDg29vX59gK+cFmNUUMg6lHO2XKf8fqDCnWA== X-Received: by 2002:a05:600c:321a:: with SMTP id r26mr11350449wmp.90.1624461860401; Wed, 23 Jun 2021 08:24:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p187sm268267wmp.28.2021.06.23.08.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:24:20 -0700 (PDT) Message-Id: <7930465e80971eeef79aff012008cd43199cfb50.1624461857.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 23 Jun 2021 15:24:13 +0000 Subject: [PATCH 3/6] ci: upgrade to using actions/{up,down}load-artifacts v2 Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin The GitHub Actions to upload/download workflow artifacts saw a major upgrade since Git's GitHub workflow was established. Let's use it. Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d430c4e0d2..a399114c0f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -90,7 +90,7 @@ jobs: NO_PERL: 1 run: ci/make-test-artifacts.sh artifacts - name: upload build artifacts - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: windows-artifacts path: artifacts @@ -104,7 +104,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: download build artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: windows-artifacts path: ${{github.workspace}} @@ -121,7 +121,7 @@ jobs: run: ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: failed-tests-windows path: ${{env.FAILED_TEST_ARTIFACTS}} @@ -170,7 +170,7 @@ jobs: 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 + uses: actions/upload-artifact@v2 with: name: vs-artifacts path: artifacts @@ -185,7 +185,7 @@ jobs: - uses: actions/checkout@v1 - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: download build artifacts - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v2 with: name: vs-artifacts path: ${{github.workspace}} @@ -204,7 +204,7 @@ jobs: run: ci/print-test-failures.sh - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: failed-tests-windows path: ${{env.FAILED_TEST_ARTIFACTS}} @@ -242,7 +242,7 @@ jobs: if: failure() - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: failed-tests-${{matrix.vector.jobname}} path: ${{env.FAILED_TEST_ARTIFACTS}} @@ -269,7 +269,7 @@ jobs: if: failure() - name: Upload failed tests' directories if: failure() && env.FAILED_TEST_ARTIFACTS != '' - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: failed-tests-${{matrix.vector.jobname}} path: ${{env.FAILED_TEST_ARTIFACTS}} From patchwork Wed Jun 23 15:24:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12340095 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B5DDC48BC2 for ; Wed, 23 Jun 2021 15:24:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 42BBB610A0 for ; Wed, 23 Jun 2021 15:24:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231361AbhFWP0r (ORCPT ); Wed, 23 Jun 2021 11:26:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44020 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231348AbhFWP0l (ORCPT ); Wed, 23 Jun 2021 11:26:41 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46970C061574 for ; Wed, 23 Jun 2021 08:24:22 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id f15so3094406wro.8 for ; Wed, 23 Jun 2021 08:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=MZlWXg3zGS+JvN+bAAm49SeIPF4y/Zt1F1SorzzxIPI=; b=T2GnS/6qgbAOEtH7tylDVHgWlqY+70WSCo81xlqP+hef3BEPU/HgIM60rN7wkBq7rj oDnrtlBFwE3aMf1lhgKRHeAxu+o1GS4muBSESx/CKe6KJUZ48WY14hzvMoQ05ajcO8et OxXNTU7hUjcLY7d4a3rcXQXmKq4w3F/3WV+x/CWztYlaQtEpFuuKq0Gy50GfM7P9Y8qX Ljpk9WTTqtoRyxYVFpY3ei72yz7dE6+bitBgBp1GkiWHS6iVyklBPaSvqKrX1CLmfssW 4nIVybtSOhojnXp3SbKiyGyK2RMzAqXyQaIt5WSn/0wbObkos9OSva0mE3C2Vn34oEIw PWjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=MZlWXg3zGS+JvN+bAAm49SeIPF4y/Zt1F1SorzzxIPI=; b=B/S76HK+BXMO20ipDlScOo4qWZfmKt422gDQG/C/U8xALlWr1KWhiFvrvOGkqtovON HRbYGzWSZYjPaWvZ893YJtfnDJBYDw4pq6C2WE5n+AToG3nc7vEdxDQ/CtvZdxyBRhP3 cZyQmLqGMZqvk5n0kmLkZJjRm8QcqpaHDeyKFd0Q05whL/qHwBjV7Jq5xgz1k+B9zRHG Q+6/LNF/fsLISRT21wnjfaddU3d6wfQBoE4WKiHWu4Q21isclfg4kXl8agokjeBIYlrK lPz3MPiT7zVXbvuWb2mzsCJYhrKaSW11mRf5eaCNeB2/stH74CjqPCM9UI/M12j/jqnS RXuQ== X-Gm-Message-State: AOAM5336ulNFk0ivD/15Z8/EHPpiu5tYKH/8Yl7Cv+IvdqGeQAbSiLBf er085yhU4qoma+qsvQBKgiNlq4skUNE= X-Google-Smtp-Source: ABdhPJxsyc7zBQNr0BkSVcm4dHpX21R6lLeulWFjQP08/gDVPosXR3Iy5TB7zlRNm0AB10hSSwok5A== X-Received: by 2002:adf:8bc9:: with SMTP id w9mr658750wra.378.1624461860928; Wed, 23 Jun 2021 08:24:20 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id o20sm6133265wms.3.2021.06.23.08.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:24:20 -0700 (PDT) Message-Id: <1520a9ffb574652fda1d2a20c97dc859fa476945.1624461857.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Wed, 23 Jun 2021 15:24:14 +0000 Subject: [PATCH 4/6] ci(windows): transfer also the Git-tracked files to the test jobs Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin Git's test suite is excruciatingly slow on Windows, mainly due to the fact that it executes a lot of shell script code, and that's simply not native to Windows. To help with that, we established the pattern where the artifacts are first built in one job, and then multiple test jobs run in parallel using the artifacts built in the first job. We take pains in transferring only the build outputs, and letting `actions/checkout` fill in the rest of the files. One major downside of that strategy is that the test jobs might fail to check out the intended revision (e.g. because the branch has been updated while the build was running, as is frequently the case with the `seen` branch). Let's transfer also the files tracked by Git, and skip the checkout step in the test jobs. Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a399114c0f..0f7516c9ef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -89,7 +89,9 @@ jobs: HOME: ${{runner.workspace}} NO_PERL: 1 run: ci/make-test-artifacts.sh artifacts - - name: upload build artifacts + - name: zip up tracked files + run: git archive -o artifacts/tracked.tar.gz HEAD + - name: upload tracked files and build artifacts uses: actions/upload-artifact@v2 with: name: windows-artifacts @@ -102,15 +104,14 @@ jobs: matrix: nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] steps: - - uses: actions/checkout@v1 - - name: download build artifacts + - name: download tracked files and build artifacts uses: actions/download-artifact@v2 with: name: windows-artifacts path: ${{github.workspace}} - - name: extract build artifacts + - name: extract tracked files and build artifacts shell: bash - run: tar xf artifacts.tar.gz + run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: test shell: bash @@ -169,7 +170,9 @@ jobs: run: | mkdir -p artifacts && eval "$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts 2>&1 | grep ^tar)" - - name: upload build artifacts + - name: zip up tracked files + run: git archive -o artifacts/tracked.tar.gz HEAD + - name: upload tracked files and build artifacts uses: actions/upload-artifact@v2 with: name: vs-artifacts @@ -182,16 +185,15 @@ jobs: matrix: nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] steps: - - uses: actions/checkout@v1 - uses: git-for-windows/setup-git-for-windows-sdk@v1 - - name: download build artifacts + - name: download tracked files and build artifacts uses: actions/download-artifact@v2 with: name: vs-artifacts path: ${{github.workspace}} - - name: extract build artifacts + - name: extract tracked files and build artifacts shell: bash - run: tar xf artifacts.tar.gz + run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz - name: test shell: bash env: From patchwork Wed Jun 23 15:24:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Ameling X-Patchwork-Id: 12340091 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0310C49EA4 for ; Wed, 23 Jun 2021 15:24:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D036D6023E for ; Wed, 23 Jun 2021 15:24:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231357AbhFWP0p (ORCPT ); Wed, 23 Jun 2021 11:26:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231336AbhFWP0k (ORCPT ); Wed, 23 Jun 2021 11:26:40 -0400 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9896C061760 for ; Wed, 23 Jun 2021 08:24:22 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id n23so1923561wms.2 for ; Wed, 23 Jun 2021 08:24:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=eCYRoFHN1s610lMicf90LmLzggLEe+t0r6vMfIYNzFA=; b=Xln+yn8m3AA8WxaGIwX25MFjEteQ5wcDFOdUKdPstFMOJn1H+fXIFPTymXLQWrBcyq PmAmS6XcmR2WfnX4ML7qVmZRyGTgsJYZ2HuTECXduGzMr4l3LEpWtI+J5SO5e0iOGL5J EChp6A1TXXxYZFLACTx2E5uUEMtvaWIVvcDSvSAR2SHajhAPpedMJhquujC5r1KHyv4r Jnf12UNmWhX1orYjjqct4g2mRq4QFZ399npLdp2S52u+hI+ljAUJDF1EbySdybl3nKMP oHxV1e/B1r8WUhBKD8CE1zvYjCk8bC3ormwA1vxtZBCIhhc+a0Bl2jrkVFqMiws+uyfA SpCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=eCYRoFHN1s610lMicf90LmLzggLEe+t0r6vMfIYNzFA=; b=GnGbtkDr3dIW0kD/22kpd2EJyb9y6GehxpT0jMqN3OQAG6+M5FOjgPMWNDsys2uKs3 fY8EUJrBT5kUAG60yC5yNA891FcIE4rzue6r9pnVl1O29GREq5IhbpR+7Jn1htu+fO+C yLxV6gQQRHRxDDYQtUiTsdlsjkf0rP3KSMalJLRBM4VwrDVK2SGQUoEIwIvxpCMKQkxQ Tclx4HJ1eKwBfjhdI9zfQDV+ysQO6X549choB2GLEo7Q4nzwrXnch4Elxja5u/mKCacx b7UAjunVf/K30Wp7tbbLpGMGZKcBEODU3ubJ0PFpKQ9DWiDKSno4PRYMTlKtCL/25cVU 2TIA== X-Gm-Message-State: AOAM532PoOL4ZA+ZwDz5OzuEVHqwV4DD4JevQt9tKAN3EwlgAamEJ7ux Z7Y16QWWxBN1NsCodmF4DzYhpCzCiAM= X-Google-Smtp-Source: ABdhPJxioRq6+FoHXke4owQVXX8IXmnURpzwXh2rFb0Od1BvRJumm2pLLVk0vkX1bnStYbVOgpbVKw== X-Received: by 2002:a05:600c:4f09:: with SMTP id l9mr11838290wmq.114.1624461861483; Wed, 23 Jun 2021 08:24:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id x3sm5766867wmi.42.2021.06.23.08.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:24:21 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Wed, 23 Jun 2021 15:24:15 +0000 Subject: [PATCH 5/6] ci(vs-build): build with NO_GETTEXT Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Dennis Ameling Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Dennis Ameling From: Dennis Ameling We already build Git for Windows with `NO_GETTEXT` when compiling with GCC. Let's do the same with Visual C, too. Signed-off-by: Dennis Ameling Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f7516c9ef..3b40c677ab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -159,7 +159,7 @@ jobs: shell: bash run: | cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \ - -DMSGFMT_EXE=C:/git-sdk-64-minimal/mingw64/bin/msgfmt.exe -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON + -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON - name: MSBuild run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142 - name: bundle artifact tar From patchwork Wed Jun 23 15:24:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12340097 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9CB0EC48BE5 for ; Wed, 23 Jun 2021 15:24:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8270A610A0 for ; Wed, 23 Jun 2021 15:24:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231319AbhFWP0r (ORCPT ); Wed, 23 Jun 2021 11:26:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231352AbhFWP0l (ORCPT ); Wed, 23 Jun 2021 11:26:41 -0400 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 519ECC061766 for ; Wed, 23 Jun 2021 08:24:23 -0700 (PDT) Received: by mail-wr1-x430.google.com with SMTP id d11so3161678wrm.0 for ; Wed, 23 Jun 2021 08:24:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=message-id:in-reply-to:references:from:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=wkS9XD+Bfyy6mgoJrEFk+IPYjLyu1Pucet3Q7umxtlA=; b=eaGYNHM1I0KuyoAdwLbTA3mzlgDvcO8RIptkXwEOfxfqDarnQvAdgawktffn/tYTuZ XMj/mGaRHoRL9DziYNgL+wtecgcJTRcAG99lUR9Rg72lgr6fI2Jlc5DzYCPY5c4tf5qA tFkJmHXCwnBycFINYQBDJL88UO52ESYeoJ5ffI8oH1uKIjZRnx6RexAgdbtzweQ+aI2K iwKXj77D8qH6GlPNVNgFw0QD4+5qp2mN9i8h0sR09mCpzZZagvV1eOxuvHkurj8fQiG1 UUNlqGT3uGPfx39FZcZZBwgCqGGIiTKDjNOXtME6VnTzH0SQ7aBh1CusKwSmkOO89fbn kBmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:message-id:in-reply-to:references:from:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=wkS9XD+Bfyy6mgoJrEFk+IPYjLyu1Pucet3Q7umxtlA=; b=Ml3UdSuDWaAg2EhgfELI191iH/tN5jZK54EBbVxF/KVQ5MCb3tiFPLZOsiGxoEeKR+ NabUnInPOwoAUELurctdkGMGOhS2hg8US6gfBa1MCFpUxfQ/oCNYLHGC6j/jLbh1XYXg r7/Nhw8ADRRdOA1VMt+ZVA6ZMS6ORe3HuFRXQKQBI6XjGr9Fq5hKnQLdJagG7StGInu0 J5WzHu5kO612TGijKbqZrFsifJvw5EpD8dElXsDVRd1HYaLTW4jPfwAGzb99LCdGwIV2 OAZiCauxy3QEWUMXaaRTAbUiraXuTsUFqprQD8a5pPUOHR3nKQfqY+SF22p4OKipRCpQ +S5Q== X-Gm-Message-State: AOAM530VLnMZsYGKukW6gQ5j1iOSMKVA2wFRRa/AKVU9jim5ghFUIlMQ HboU9qUd5w12adUJG7lWNMunxalLrIA= X-Google-Smtp-Source: ABdhPJycjFw+63i/0a7TCE5EpgM09a3Poiexh1O9nr3hY/1l5xiqEJp4ZQhcGV73ki1BK3I8pD2eBg== X-Received: by 2002:adf:f284:: with SMTP id k4mr634086wro.177.1624461861989; Wed, 23 Jun 2021 08:24:21 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f22sm239779wmb.46.2021.06.23.08.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Jun 2021 08:24:21 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Wed, 23 Jun 2021 15:24:16 +0000 Subject: [PATCH 6/6] ci: accelerate the checkout Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin By upgrading from v1 to v2 of `actions/checkout`, we avoid fetching all the tags and the complete history: v2 only fetches one revision by default. This should make things a lot faster. Note that `actions/checkout@v2` seems to be incompatible with running in containers: https://github.com/actions/checkout/issues/151. Therefore, we stick with v1 there. Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3b40c677ab..405204c78a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: if: needs.ci-config.outputs.enabled == 'yes' runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: build shell: bash @@ -134,7 +134,7 @@ jobs: GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'" runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - uses: git-for-windows/setup-git-for-windows-sdk@v1 - name: initialize vcpkg uses: actions/checkout@v2 @@ -237,7 +237,7 @@ jobs: jobname: ${{matrix.vector.jobname}} runs-on: ${{matrix.vector.pool}} steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - run: ci/install-dependencies.sh - run: ci/run-build-and-tests.sh - run: ci/print-test-failures.sh @@ -282,7 +282,7 @@ jobs: jobname: StaticAnalysis runs-on: ubuntu-18.04 steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - run: ci/install-dependencies.sh - run: ci/run-static-analysis.sh documentation: @@ -292,6 +292,6 @@ jobs: jobname: Documentation runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - run: ci/install-dependencies.sh - run: ci/test-documentation.sh