From patchwork Sun Jul 4 22:55:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12357703 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,URIBL_BLOCKED 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 ABED7C07E96 for ; Sun, 4 Jul 2021 22:55:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7F566613F9 for ; Sun, 4 Jul 2021 22:55:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229732AbhGDW5y (ORCPT ); Sun, 4 Jul 2021 18:57:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229681AbhGDW5x (ORCPT ); Sun, 4 Jul 2021 18:57:53 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D08ACC061574 for ; Sun, 4 Jul 2021 15:55:17 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id t6so9804903wrm.9 for ; Sun, 04 Jul 2021 15:55:17 -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=D59yLYtIqgqt7W1tzFRXWjA/HUfFFOerdvW3N6O6HKA=; b=N6iQFAK/0FH4ZOqq7fRF3nv8aNQ+1TWwArf9ca5c0tDtKN2C1kNVGrsK6envryb39r dH19NRUHm0kZ6cIbgeWHvNr8Kp7FT3fSNRbvyDsWoI5SyHm0N1/RcUCMx1F2RtV2oHAI xk2iBa1sEnulN0SND7VCCvXtG7Zy+dH0OaR4pIJsEWfBKBYaAiA5knAF9S0Aq1UKjTbS VSNtUDw+xVA2sxevwDzyFhPr5gKD4Rhmrd2w1RB4arwfoaHfmbAHZgehJZpJPO/9qM6K +Yq4OlS+CtXOEvtjg9ECC/ftDdxzd5emwMqafZGRyu7xvGTcf70BCTr2ZavLjXk7tdLQ py8Q== 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=D59yLYtIqgqt7W1tzFRXWjA/HUfFFOerdvW3N6O6HKA=; b=OBEJZQfSBmtoD0f+l91bdLWuRWk6pfZV+/UXfcUQJyW6tk204hq89Wb7THlQMOgn17 koSjhVeTug8k7HXpWdIoUeSq1cDXQ0vkwfk+uHuZjuLqDw4kablYa3DrzomFCuo6lOjy sOPA07I89u/zeFy+GT0tVHiEzPmwqktWZgwANTcVupFvbeXYFmJpzZutIvcMfrFn/V26 eFWAw9v5cteIhe62X437+qtsWfLAHfRem6F+ySCUHWpXV8NPHU2p8qP6/67fHaFksi3T 8Y1jNHg0FMxdPoOpVN23OaBSmsj7Dc8WPBKZn70h16QQwV+efHRaCen+jCxJL9MVPJy2 6PUw== X-Gm-Message-State: AOAM5335akGcL9oQwkp8xI19B6zXz4z5UG2Kh2gM3PkPy811nvMjk5qu oiF6eIZjTcy4mwfLV9VQvYJJqbx3FgM= X-Google-Smtp-Source: ABdhPJyhsScP4JVxYCM2pWDTvGpLvLKrI6O9PrmIJZ+yup08lql7XwDbyG6rPSHXzRE/WaDt51Ooag== X-Received: by 2002:adf:82a1:: with SMTP id 30mr12392888wrc.31.1625439316389; Sun, 04 Jul 2021 15:55:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id f12sm3284873wmg.16.2021.07.04.15.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 15:55:16 -0700 (PDT) Message-Id: <2e4db688deb938592257882c06b658cf3b8463f8.1625439315.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 04 Jul 2021 22:55:08 +0000 Subject: [PATCH v3 1/7] ci: use the new GitHub Action to download git-sdk-64-minimal Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin 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 73856bafc9d..c62766e7b1a 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 Sun Jul 4 22:55:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12357705 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,URIBL_BLOCKED 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 C32CCC07E95 for ; Sun, 4 Jul 2021 22:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A05F661405 for ; Sun, 4 Jul 2021 22:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229753AbhGDW54 (ORCPT ); Sun, 4 Jul 2021 18:57:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229728AbhGDW5y (ORCPT ); Sun, 4 Jul 2021 18:57:54 -0400 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62F6BC061762 for ; Sun, 4 Jul 2021 15:55:18 -0700 (PDT) Received: by mail-wm1-x32f.google.com with SMTP id g10so4289550wmh.2 for ; Sun, 04 Jul 2021 15:55:18 -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=l5tssxgXBNdmehgBPfSsJoodec/GZNGIGBmTzK8DcXo=; b=STvERgc5VeNaojbQCVEmIhkDeH/Ux/vj+C253b1eTvcKGNYBPk1eWb4n3xMAdKxBke J+1KVysGI7b0vzgVMqUFVDRa8e3m4xpcfm2qgzrl/UJk7GNpZxq08ohBcyj+VhaEM9PX jBjurh/qnhtAAgQ/BiYUdg//jofekHb8zJ51lCsoBimus9wxOi4ObGhp4vzTuk1KMzQO m90jT1QZI4ed6eplgwaQcr9gDV1+5x1d2XYQK0XZt8dtSy3oM7rxFuvWNFTOT0PD93wi 9GbL6S9zPGCWlrLJ7NCzNW9vC1PUBV2k0eC6cwWXbjiY/AIwAGUPleS4xSMav9q7qTYI dtJg== 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=l5tssxgXBNdmehgBPfSsJoodec/GZNGIGBmTzK8DcXo=; b=HGGh4Wsc7vjOuTlv4tI/N9PDSU+ubwhsMDGJGLOt8ZZ9y6lchocWiqcV+py+Si7H/I YF2oorXFkDex1Ce4CaWl2V9L/ol5vjR8ye7n8hSiBRVOgiF/GVirGJ5oFJDT2JHwiDRb vmjN3ASkw5S7SpW1rsKG+PkcTUVjZcROH1XTsy1nTbidMrj828BC1lxJTXBpjnFeokCg UgHXyTp5eM76z8VRLs080b6LjrhU8VKBvgX3FIrIT+5rdiPK0l4qkBfdg2RMf+AAXrGG V/8sY/23mqOpi8Lm3HL0Gb3oc7Lo3POccjydkbryHiW9Yi7l5jWAReI7ZguRdLNWxpcc f07g== X-Gm-Message-State: AOAM5327QulquwvsKv7zn6VrfgKdauddWLhL4akcXpr/qUe87GhGlpYN wo5WOupkpg+SgM2A1xnr6sBROdPIADA= X-Google-Smtp-Source: ABdhPJyioU+4AY5qZj+r+c+VOJGw/9tagKmr+O9ti3KQqAUCNjs0+3WOn00e9j7uF5Uu6+c7729fiw== X-Received: by 2002:a1c:7515:: with SMTP id o21mr11921310wmc.65.1625439316947; Sun, 04 Jul 2021 15:55:16 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id w1sm10136491wmi.13.2021.07.04.15.55.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 15:55:16 -0700 (PDT) Message-Id: <6b12fe2284cb5949a57d2e39c543bef3ff12784d.1625439315.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 04 Jul 2021 22:55:09 +0000 Subject: [PATCH v3 2/7] ci (vs-build): use `cmd` to copy the DLLs, not `powershell` Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin We 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 c62766e7b1a..d430c4e0d20 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 Sun Jul 4 22:55:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12357707 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,URIBL_BLOCKED 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 C563CC07E96 for ; Sun, 4 Jul 2021 22:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD2626145D for ; Sun, 4 Jul 2021 22:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229785AbhGDW55 (ORCPT ); Sun, 4 Jul 2021 18:57:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229740AbhGDW54 (ORCPT ); Sun, 4 Jul 2021 18:57:56 -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 E9F70C061574 for ; Sun, 4 Jul 2021 15:55:18 -0700 (PDT) Received: by mail-wm1-x32c.google.com with SMTP id u5-20020a7bc0450000b02901480e40338bso8912752wmc.1 for ; Sun, 04 Jul 2021 15:55:18 -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=1u8MGfSxgCE03cekx/+oC9KGRE09BcEKKiz0MnCYhaQ=; b=OsLJOGqKdNcYpnS+lj4aBgHRAdgXxyY8yJ9OuSB/0ohyFHYaCGfSTX6oI04arFaHL3 z9xiyWZOKjyB24ZF0YWiw4DUaFVHXoIXYXoIwiK/uA6luy51SzwxPeOhHyZJCCIDPhSI jVzZl8/kXTkl7XDkSgvYO6M57fUU6PyufX6Z0qPHYWyBNDkLY1oljKI7dovlab3vw3cS lOMu9PygGEubEyeKwOY3+WClv7cIDsXzkuoIFfaFLpR4zfuJFx5w0AaHcPywVAGy2bfq MnEQ0bByDQJnO4+nEYWxTTMZ1bSD/tUXahFx/g1IxzWR7VTDa3ZiWOFrpo/kznxyC3/z bsIQ== 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=1u8MGfSxgCE03cekx/+oC9KGRE09BcEKKiz0MnCYhaQ=; b=i5DbBXNViej/oPzIw9iixMpyU7w/MFPv8hPTUgo18GRjRZKa0DCdfqzt9khRB9pRbI Zt4zP2950wzZCy8UWZbDXBAoe9f/6EepYvhflFRh9cDZ2jjA36RZMVSBGEd0hpxfdup9 3uFQmaO29BLLD1paCmLc7mnO+GQg/G0fUpVbKRvW4tO0DAkRh7IWQTj9LvwOC9urroEc byxhB7tC7TawOaS36uzyE7rNpWqbtltaq+mmRHsp7erTYIOKxpiCL0xZ8I5Kue2Ip0Is H8RjZ49FolDAK+WqHXXbB1JXPk+FY61koTmoAZuB82lNaYvHfZfh0H/NUoCvn1JmnzN7 /0WA== X-Gm-Message-State: AOAM531mYKvLOu9+H0IEp9/j7Ju3TmEGeKloxaF51zJfvH5wt/enpAN2 HjgX3IkGZ7Wg0Vri9/QRcjVP6wDjsOE= X-Google-Smtp-Source: ABdhPJxSaFDX9ayJtdDiVkhJ0ZyoD05tX22Q1ykHGkTwcv5VC9Z/zVCL5geoXV/kGDrwimZ8ROsvLw== X-Received: by 2002:a05:600c:3782:: with SMTP id o2mr11442062wmr.152.1625439317568; Sun, 04 Jul 2021 15:55:17 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id c8sm10713764wri.91.2021.07.04.15.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 15:55:17 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sun, 04 Jul 2021 22:55:10 +0000 Subject: [PATCH v3 3/7] ci: upgrade to using actions/{up,down}load-artifacts v2 Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin 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 d430c4e0d20..a399114c0f8 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 Sun Jul 4 22:55: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: 12357709 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,URIBL_BLOCKED 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 DFB6BC07E9A for ; Sun, 4 Jul 2021 22:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C2DAE613F9 for ; Sun, 4 Jul 2021 22:55:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229760AbhGDW54 (ORCPT ); Sun, 4 Jul 2021 18:57:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229733AbhGDW5z (ORCPT ); Sun, 4 Jul 2021 18:57:55 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9C79BC061762 for ; Sun, 4 Jul 2021 15:55:19 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id a8so8041745wrp.5 for ; Sun, 04 Jul 2021 15:55:19 -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=OWdmvoLFvRKaZ00xRXQUel4GoLKe8gPH+g71h/kYGls=; b=Gxm9As2Xt2y+NDVANJlw9HhYSBcmdG8nBlmL87wDcYFYho+sNMcagJB61XmsYA3eds DWSGUuCMfAsc73ZbLxRMdTw/H41phytJXysJLawLEiZd9O2Ktk5iw/uypuFzasO78cKs gnKstph39T+MM104dv/INAU54kEigFV+MmfQu8l44572HGxg9hvYP3gtS1be2t4qH5di 8CsEtojY7yJAebBp19pPxgiJXmb8CnrVMVLb4HgauK2PEd4ihDcw64/7o6vYUaqM49fQ a/70MhMciXoMqwREBiDXCqW/D2nOUkfwZ3rT+QWLLIFSJQ5nBMBXlakK8ivI1KOkAkL1 hRdA== 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=OWdmvoLFvRKaZ00xRXQUel4GoLKe8gPH+g71h/kYGls=; b=SdSyGSNzAXveUqRnJr8YoMLoDj+2kHk79+cyz8IF17YQ7qACtzeRpN5UxrUFQeJMZN 94nkXmaucw5tRLpdFQcG7zcqWyXZdsm8EC5/phIzNTJAcPkq0nxx6YO8501aAoW56+DN v7QZfu1KJEjXXu7VF8lpgRy3V9c5qnONMKDIcccl2J5qQ5CC2Zy8Mp1VWw6NZ7duf3+q ue7SDEk7MpkC27r5Myn0Hc9ICUUvWoibfkFw5/Jc8nXjcXw1PpO+Lfw8ESHGa+YhERuX zLNeiZod+6/39zUDNuLsVYcpdIHl0CX2nEY9cgTAQxSxpscs0bTRHvbCoVpl8AWrbXyf q70w== X-Gm-Message-State: AOAM533/LE6bCARuiXWmq2UumwPM3cD0nTkH1d1A08G78wyaZoiWXEy4 anx9TKPv0s1bz1qqx5L7KGKQe6eQfDY= X-Google-Smtp-Source: ABdhPJyuI5NAMHgIl2S+jNqEGle+I+OB0R6QwNn+VLk9ldMfepePNtUIUR8KtSQwbUVO+imuENnLSg== X-Received: by 2002:a5d:448c:: with SMTP id j12mr12729517wrq.105.1625439318276; Sun, 04 Jul 2021 15:55:18 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id r3sm8223086wrz.89.2021.07.04.15.55.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 15:55:17 -0700 (PDT) Message-Id: <59dc44428fbc168a5edbb6e6679c9b8aff8d74c1.1625439315.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 04 Jul 2021 22:55:11 +0000 Subject: [PATCH v3 4/7] ci(windows): transfer also the Git-tracked files to the test jobs Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin 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 a399114c0f8..0f7516c9ef3 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 Sun Jul 4 22:55:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Johannes Schindelin X-Patchwork-Id: 12357713 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,URIBL_BLOCKED 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 A952DC07E9A for ; Sun, 4 Jul 2021 22:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B74561405 for ; Sun, 4 Jul 2021 22:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229809AbhGDW6A (ORCPT ); Sun, 4 Jul 2021 18:58:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42066 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229744AbhGDW54 (ORCPT ); Sun, 4 Jul 2021 18:57:56 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 21393C061764 for ; Sun, 4 Jul 2021 15:55:20 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id i94so19739518wri.4 for ; Sun, 04 Jul 2021 15:55: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:mime-version :content-transfer-encoding:fcc:to:cc; bh=ohsUwEUJZWDq0n1SM4MVcIHcOiKQb72SOf9FIpQcgSo=; b=iTIPjvnxQtBvUUy5l0Ty6YVS+UNzJVXmGSC1jfqeL1VGf4iklWxROQiw+pzih1lzs4 Tr96cd8oUqquWkhIhqlTb9F1R/YRgQo11EgLMAjOgNuacnuQhrK/WoernhxH4YZEGTPH zCfPEIVzdqhZlEi4/fkI/zwoguW3fxBBv1nYv/DdrKDoLkahGoMqX05F4VmwhCKkeE0P H+sWeJ+jU5RrrUMpRRIe5A7eB9XqB+uPEXfh3YmZ+NP8yqfhk0lgoM81chDvcYmp+MC5 ekqt5/1a+ctCsayGrF6LCeb1egBw2Sx+2gf8DDE95n1yFkaVJygpQG7+eDIjJuJXX1ob +RcQ== 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:mime-version:content-transfer-encoding:fcc:to:cc; bh=ohsUwEUJZWDq0n1SM4MVcIHcOiKQb72SOf9FIpQcgSo=; b=h0ml8Ix99ECX7SbBF3r3X6HX6GWju7yKaf84Alu3+RdErpOoxdsDhS8w0MWWsWA6kq oDrtzijbDP8S2MTIk6rb3U6w8LyCZmVMdDbAFGoI37ucWipha4fVJuxeiHw3oDX2Bfbh jvIXROJDZJQZZyThIzUNOyfilRho9BvtdIvphoIj4FJBhlapmrtqujVbrNPGZLI/mG/l TWY9SDG+MsQVSsF8I5dzu/EMkrS9PR2i+WIDmqXckiZJpFqSfguUb+qf18Qgzr2UXeXm ar5L355UcBJtTWg5wYsx7lGJfwZohDuCVBveOWI0Ma6L/aGn3iVklzXK71hJRXAcVr2Q 3ulA== X-Gm-Message-State: AOAM532ejgYu2WUCfyWHotQRgNvjlvDYaQXS9hs98AzaIlYG9EVGRfcm b3KydeHRGcIeENeAcB+4dwd9IekshOM= X-Google-Smtp-Source: ABdhPJxPnzLAz9WO7GbnCWm61eOq+XwZ1on+5sSbD57XrCUzPjNtadG+eq1ceMpWtlt8r2JEtmTTKw== X-Received: by 2002:a5d:4a8d:: with SMTP id o13mr12090540wrq.241.1625439318860; Sun, 04 Jul 2021 15:55:18 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id j17sm14057337wmi.41.2021.07.04.15.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 15:55:18 -0700 (PDT) Message-Id: <64f7b1f4e231730c002dfdbac80627ace0e83bbc.1625439315.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 04 Jul 2021 22:55:12 +0000 Subject: [PATCH v3 5/7] artifacts-tar: respect NO_GETTEXT MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin We obviously do not want to bundle `.mo` files during `make artifacts-tar NO_GETTEXT=Yep`, but that was the case. To fix that, go a step beyond just fixing the symptom, and simply define the lists of `.po` and `.mo` files as empty if `NO_GETTEXT` is set. Helped-by: Matthias Aßhauer Signed-off-by: Johannes Schindelin --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c3565fc0f8f..04e852be015 100644 --- a/Makefile +++ b/Makefile @@ -2675,10 +2675,13 @@ po/git.pot: $(GENERATED_H) FORCE .PHONY: pot pot: po/git.pot +ifdef NO_GETTEXT +POFILES := +MOFILES := +else POFILES := $(wildcard po/*.po) MOFILES := $(patsubst po/%.po,po/build/locale/%/LC_MESSAGES/git.mo,$(POFILES)) -ifndef NO_GETTEXT all:: $(MOFILES) endif From patchwork Sun Jul 4 22:55:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Dennis Ameling X-Patchwork-Id: 12357715 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,URIBL_BLOCKED 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 B748FC07E96 for ; Sun, 4 Jul 2021 22:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9C7E961474 for ; Sun, 4 Jul 2021 22:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229852AbhGDW6C (ORCPT ); Sun, 4 Jul 2021 18:58:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229734AbhGDW54 (ORCPT ); Sun, 4 Jul 2021 18:57:56 -0400 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8F79C061765 for ; Sun, 4 Jul 2021 15:55:20 -0700 (PDT) Received: by mail-wr1-x42c.google.com with SMTP id v5so19733326wrt.3 for ; Sun, 04 Jul 2021 15:55: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:mime-version :content-transfer-encoding:fcc:to:cc; bh=77NXCINekiYU4CYx4ZMtBG1HLQhH6gXiNvrgzqAlMUg=; b=BjocQF+5FG+WexqcTjngV7lV/xg+GKtfOqvK/N9qgRbHbFbd+EuM+x0/JdDZ53isvQ Kj2Twvcun/6yt9zp1OZ7+xyOTxTzPScSaxhxczidUdEOmMqWB5TX+cGn8yQCwajkWPgY 4FKwZML2aEZmBUKD+96tEvp8e1pyyYWXV19l9MjL8Z/RPnepox1baR/GlXWxTT2FhyAH iFhrRaFEgeVpv4tOAxotarMC7OUb1dhuBrOaMPBxdJaYgLX72ez5ogKpXUmbZw01enad X3+4hew5XaLxxR9sdmPWibrVmoSlJQ5a3BKHUXptiWy2mdDtGazpZ7wVEjC6V/1ROU2N RX6A== 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:mime-version:content-transfer-encoding:fcc:to:cc; bh=77NXCINekiYU4CYx4ZMtBG1HLQhH6gXiNvrgzqAlMUg=; b=QQGpjBtIxurK+VF9KSGXjfoUF/qUp5StFumduh6zuP5o7j0wr6V/UwGH/T1dU86nmw 8JZ38yO+Hs4nZtsrwKLUWMmdH9FrCI9HvTJWM7id1Z5rWr+J/wqwnS6rofk6cAxSb0dR OYuvsDaGSlB2GBbijboGzwNO++ZYTICHpeiRu8etwMXU9g5MapWdTLV+Vs3w6Yg3m7HY EWJpON4ipTuCk3ngpBSGUVsLCu/QbEisWjiq9UNak2cEMw71cBXLvz2V04T9zDqn7/xS xtUdGPsyGhW0v6C8QZ9SFOdMZBnBqIwGazVXN5W3KpQ7MLrbBFf6GRSoV5QJcGER+SUN rPBg== X-Gm-Message-State: AOAM533eddj5jEd7YYcjjAXeYrWyb80c8jSOtm9L7TRrpyRPY4iqCik1 oIDuMdvthY5K7Ow5Z+XJEHVXd8QJ218= X-Google-Smtp-Source: ABdhPJzVeCAGP4RytGLTkUAes+uVbufTWS70UmFfWPkbGfg9ksExDUvqKn8X4QeZMZa2I8ay196uhQ== X-Received: by 2002:a5d:5586:: with SMTP id i6mr12321574wrv.195.1625439319396; Sun, 04 Jul 2021 15:55:19 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id p9sm10697380wrx.59.2021.07.04.15.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 15:55:19 -0700 (PDT) Message-Id: <2c4cd9dd1c8d966c8df0349bb820449ae1290793.1625439315.git.gitgitgadget@gmail.com> In-Reply-To: References: Date: Sun, 04 Jul 2021 22:55:13 +0000 Subject: [PATCH v3 6/7] ci(vs-build): build with NO_GETTEXT MIME-Version: 1.0 Fcc: Sent To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , 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. Note that we do not technically _need_ to pass `NO_GETTEXT` explicitly in that `make artifacts-tar` invocation because we do this while `MSVC` is set (which will set `uname_S := Windows`, which in turn will set `NO_GETTEXT = YesPlease`). But it is definitely nicer to be explicit here. Signed-off-by: Dennis Ameling Helped-by: Matthias Aßhauer Signed-off-by: Johannes Schindelin --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0f7516c9ef3..c99628681ef 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 @@ -169,7 +169,7 @@ jobs: VCPKG_ROOT: ${{github.workspace}}\compat\vcbuild\vcpkg run: | mkdir -p artifacts && - eval "$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts 2>&1 | grep ^tar)" + eval "$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts NO_GETTEXT=YesPlease 2>&1 | grep ^tar)" - name: zip up tracked files run: git archive -o artifacts/tracked.tar.gz HEAD - name: upload tracked files and build artifacts From patchwork Sun Jul 4 22:55: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: 12357711 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,URIBL_BLOCKED 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 6CAE9C07E95 for ; Sun, 4 Jul 2021 22:55:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 478B861405 for ; Sun, 4 Jul 2021 22:55:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229823AbhGDW6C (ORCPT ); Sun, 4 Jul 2021 18:58:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229771AbhGDW55 (ORCPT ); Sun, 4 Jul 2021 18:57:57 -0400 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47D0EC061574 for ; Sun, 4 Jul 2021 15:55:21 -0700 (PDT) Received: by mail-wr1-x435.google.com with SMTP id a13so19688067wrf.10 for ; Sun, 04 Jul 2021 15:55: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=AmkW7Q+V0k3KySWrKmjRcqCcZBaZb/9eiscfQtg3q8M=; b=Q9xWxnAaMI+AcxVTFvLBHiDRmcy0WsMXHht+YceSaV0EwNNQhgf5eI7etuhVk2K+ZJ m6qrACBMIdUmMv6itAFu7bx+mnPgqzSggtxLZFpDRw56Gx1GuwOmkIa8RbFo8PtmVbn+ fkIEZi0AlzHbfK3LedDLB60oHkdF+jvMBMVm/Jv7DAmNdn9/Ae2aULJl1OziBs61H8i6 Cd0OwVm1dBLOo2ZP8qlA12KPgSvAP30mQ7fmoQIUb/g+cRN8wG9/JrK6sLP3ECnfj0aJ I6z5ZwvOzgeuaFpkSa9lzZTCMpWWvsl0Dp8CIDvpU511SJYqcX8aSV1pTP4P9oFCoFrc 7pZg== 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=AmkW7Q+V0k3KySWrKmjRcqCcZBaZb/9eiscfQtg3q8M=; b=Po0FE+/IJCA9yzMJ0YEK6O7H4cdZpl4Umo/VdqO/EM4ccUg+6F/4Ik2kxDist9LYTR 3UXVU6SjyFZftqrEWDhRuGukiiKFyeksifSQ2hcsCn2ZXitj8usxfbPws795LuJ3ZbOl xJrPFf1n2f4Kz8RQrs7NW6va+YX22TuIoEM+A18RtJefh4gURnHcj9G7uT429Wsm/J7M YDnRuNdkwvVZKLiKbivzPHETAOyKbiaCKN2G9jFWF/F6VPte6/v/YUWVrsuPo9uCLxSX XWrwHnYTp8/W7BNFYeqXrRCxRc4ppMbhRirwP/PapSlT2vGYjr88sLQk8zKysOwow1yY 8clA== X-Gm-Message-State: AOAM532Ky648KTTNTyA+HIDE66r2e2BWNtxaCaEuEOCh+pa9QlL3kLOr xSxqb4wOK6gUzOFb+k2br778OjsSQZ8= X-Google-Smtp-Source: ABdhPJwEkwZPzJ2/uUJwTYxfDmcY1+7BNVo3RLb5da4z/XbJeMolme2cve0TxMoEsNaB7OZ/Hx9F9A== X-Received: by 2002:a5d:400a:: with SMTP id n10mr12278447wrp.268.1625439319962; Sun, 04 Jul 2021 15:55:19 -0700 (PDT) Received: from [127.0.0.1] ([13.74.141.28]) by smtp.gmail.com with ESMTPSA id y3sm11422182wru.78.2021.07.04.15.55.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jul 2021 15:55:19 -0700 (PDT) Message-Id: In-Reply-To: References: Date: Sun, 04 Jul 2021 22:55:14 +0000 Subject: [PATCH v3 7/7] ci: accelerate the checkout Fcc: Sent MIME-Version: 1.0 To: git@vger.kernel.org Cc: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Schindelin , Johannes Schindelin Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Johannes Schindelin From: Johannes Schindelin 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 c99628681ef..e6f99e29a3d 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