From: "Sibi Siddharthan via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Sibi Siddharthan <sibisiddharthan.github@gmail.com>,
Sibi Siddharthan <sibisiddharthan.github@gmail.com>
Subject: [PATCH v2 11/11] ci: modification of main.yml to use cmake for vs-build job
Date: Tue, 12 May 2020 16:50:54 +0000 [thread overview]
Message-ID: <fa1b8032906c6042a0e5851f803ec0427922a1a5.1589302255.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.614.v2.git.1589302254.gitgitgadget@gmail.com>
From: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
This patch modifies .github/workflows/main.yml to use CMake for
Visual Studio builds.
Modified the vs-test step to match windows-test step. This speeds
up the vs-test. Calling git-cmd from powershell and then calling git-bash
to perform the tests slows things down(factor of about 6). So git-bash
is directly called from powershell to perform the tests using prove.
NOTE: Since GitHub keeps the same directory for each job
(with respect to path) absolute paths are used in the bin-wrapper
scripts.
GitHub has switched to CMake 3.17.1 which changed the behaviour of
FindCURL module. An extra definition (-DCURL_NO_CURL_CMAKE=ON) has been
added to revert to the old behaviour.
Edit(Explanation for the reordering of build steps):
In the configuration phase CMake looks for the required libraries for
building git (eg zlib,libiconv). So we extract the libraries before we
configure.
Changes:
The CMake script has been relocated to contib/buildsystems, so point
to the CMakeLists.txt in the invocation commands.
The generation command now uses the absolute paths for the generation
step.
To check for ICONV_OMITS_BOM libiconv.dll needs to be in the working
directory of script or path. So we copy the dlls before we configure.
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
---
.github/workflows/main.yml | 46 +++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fd4df939b50..7a65cc0764f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -80,13 +80,6 @@ jobs:
- 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: |
@@ -98,6 +91,14 @@ jobs:
Remove-Item compat.zip
- name: add msbuild to PATH
uses: microsoft/setup-msbuild@v1.0.0
+ - name: copy dlls to root
+ shell: powershell
+ run: |
+ & compat\vcbuild\vcpkg_copy_dlls.bat release
+ if (!$?) { exit(1) }
+ - name: generate Visual Studio solution
+ 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
- name: MSBuild
run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
- name: bundle artifact tar
@@ -106,8 +107,6 @@ jobs:
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)\"
@@ -125,9 +124,9 @@ jobs:
nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
steps:
- uses: actions/checkout@v1
- - name: download git-64-portable
+ - name: download git-sdk-64-minimal
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 -
+ 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:
@@ -136,23 +135,30 @@ jobs:
- name: extract build artifacts
shell: bash
run: tar xf artifacts.tar.gz
- - name: test (parallel)
+ - name: test
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
+ & .\git-sdk-64-minimal\usr\bin\bash.exe -lc @"
+ # Let Git ignore the SDK
+ printf '%s\n' /git-sdk-64-minimal/ >>.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)
+ 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
+ - 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}}
regular:
strategy:
matrix:
--
gitgitgadget
next prev parent reply other threads:[~2020-05-12 16:51 UTC|newest]
Thread overview: 179+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-24 4:01 [PATCH 0/8] CMake build system for git Sibi Siddharthan via GitGitGadget
2020-04-24 4:01 ` [PATCH 1/8] Introduce CMake support for configuring Git on Linux Sibi Siddharthan via GitGitGadget
2020-04-24 17:05 ` Danh Doan
2020-04-24 21:06 ` Sibi Siddharthan
2020-04-24 22:56 ` Danh Doan
2020-04-25 3:50 ` Sibi Siddharthan
2020-04-25 13:34 ` Johannes Schindelin
2020-04-25 17:07 ` brian m. carlson
2020-04-25 17:36 ` Randall S. Becker
2020-04-25 18:01 ` Philip Oakley
2020-04-25 18:11 ` Sibi Siddharthan
2020-04-24 4:01 ` [PATCH 2/8] cmake: generate the shell/perl/python scripts and templates, translations Sibi Siddharthan via GitGitGadget
2020-04-24 17:19 ` Danh Doan
2020-04-24 21:19 ` Sibi Siddharthan
2020-04-24 4:01 ` [PATCH 3/8] cmake: installation support for git Sibi Siddharthan via GitGitGadget
2020-04-24 17:23 ` Danh Doan
2020-04-24 21:24 ` Sibi Siddharthan
2020-04-24 4:01 ` [PATCH 4/8] cmake: support for testing git with ctest Sibi Siddharthan via GitGitGadget
2020-04-24 17:28 ` Danh Doan
2020-04-24 21:26 ` Sibi Siddharthan
2020-04-24 4:01 ` [PATCH 5/8] cmake: support for testing git when building out of the source tree Sibi Siddharthan via GitGitGadget
2020-04-24 17:34 ` Danh Doan
2020-04-24 21:32 ` Sibi Siddharthan
2020-04-24 23:09 ` Danh Doan
2020-04-25 3:57 ` Sibi Siddharthan
2020-04-24 4:01 ` [PATCH 6/8] cmake: support for building git on windows with mingw Sibi Siddharthan via GitGitGadget
2020-04-24 17:39 ` Philip Oakley
2020-04-24 20:29 ` Sibi Siddharthan
2020-04-25 11:37 ` Philip Oakley
2020-04-25 12:09 ` Sibi Siddharthan
2020-04-24 4:01 ` [PATCH 7/8] cmake: support for building git on windows with msvc and clang Sibi Siddharthan via GitGitGadget
2020-04-24 17:39 ` Danh Doan
2020-04-24 21:35 ` Sibi Siddharthan
2020-04-24 4:01 ` [PATCH 8/8] ci: modification of main.yml to use cmake for vs-build job Sibi Siddharthan via GitGitGadget
2020-04-24 17:45 ` Danh Doan
2020-04-24 21:41 ` Sibi Siddharthan
2020-04-24 21:44 ` Johannes Schindelin
2020-04-24 18:56 ` [PATCH 0/8] CMake build system for git Junio C Hamano
2020-04-24 19:50 ` Sibi Siddharthan
2020-04-24 21:43 ` Junio C Hamano
2020-04-25 4:09 ` Sibi Siddharthan
2020-04-25 12:56 ` Philip Oakley
2020-04-25 13:29 ` Johannes Schindelin
2020-04-25 14:12 ` Sibi Siddharthan
2020-04-25 14:28 ` Johannes Schindelin
2020-04-25 14:38 ` Sibi Siddharthan
2020-04-25 14:49 ` Johannes Schindelin
2020-04-25 14:57 ` Sibi Siddharthan
2020-04-26 0:41 ` Danh Doan
2020-04-26 4:30 ` Sibi Siddharthan
2020-04-25 12:24 ` Johannes Schindelin
2020-04-27 20:08 ` Jeff King
2020-04-27 20:12 ` Jeff King
2020-04-28 13:52 ` Danh Doan
2020-04-28 21:07 ` Jeff King
2020-04-29 8:42 ` Sibi Siddharthan
2020-05-01 19:32 ` Johannes Schindelin
2020-05-02 14:31 ` Sibi Siddharthan
2020-05-02 14:58 ` Randall S. Becker
2020-05-02 15:48 ` Junio C Hamano
2020-05-03 15:33 ` Sibi Siddharthan
2020-05-03 17:21 ` Junio C Hamano
2020-05-03 19:42 ` Konstantin Tokarev
2020-05-03 19:50 ` Junio C Hamano
2020-05-04 14:31 ` Johannes Schindelin
2020-05-04 21:59 ` Konstantin Tokarev
2020-05-05 4:16 ` Sibi Siddharthan
2020-05-05 6:16 ` Junio C Hamano
2020-05-05 16:23 ` Sibi Siddharthan
2020-05-05 18:17 ` Junio C Hamano
2020-05-06 18:43 ` Sibi Siddharthan
2020-05-07 11:48 ` Đoàn Trần Công Danh
2020-05-06 21:27 ` Johannes Schindelin
2020-05-07 20:54 ` Johannes Schindelin
2020-05-02 13:21 ` Danh Doan
2020-05-02 14:50 ` Sibi Siddharthan
2020-05-02 15:02 ` Danh Doan
2020-05-02 15:16 ` Sibi Siddharthan
2020-04-27 21:17 ` Junio C Hamano
2020-04-27 21:56 ` Michal Suchánek
2020-04-27 22:09 ` Jeff King
2020-04-27 22:23 ` Elijah Newren
2020-04-27 23:16 ` Junio C Hamano
2020-04-28 5:36 ` Jeff King
2020-05-12 16:50 ` [PATCH v2 00/11] " Sibi Siddharthan via GitGitGadget
2020-05-12 16:50 ` [PATCH v2 01/11] Introduce CMake support for configuring Git on Linux Sibi Siddharthan via GitGitGadget
2020-05-12 20:59 ` Junio C Hamano
2020-05-13 20:21 ` Sibi Siddharthan
2020-05-12 16:50 ` [PATCH v2 02/11] cmake: generate the shell/perl/python scripts and templates, translations Sibi Siddharthan via GitGitGadget
2020-05-12 21:19 ` Junio C Hamano
2020-05-13 20:07 ` Sibi Siddharthan
2020-05-12 16:50 ` [PATCH v2 03/11] cmake: installation support for git Sibi Siddharthan via GitGitGadget
2020-05-12 16:50 ` [PATCH v2 04/11] cmake: support for testing git with ctest Sibi Siddharthan via GitGitGadget
2020-05-12 16:50 ` [PATCH v2 05/11] cmake: support for testing git when building out of the source tree Sibi Siddharthan via GitGitGadget
2020-05-12 16:50 ` [PATCH v2 06/11] cmake: support for building git on windows with mingw Sibi Siddharthan via GitGitGadget
2020-05-14 15:25 ` Đoàn Trần Công Danh
2020-05-14 18:27 ` Sibi Siddharthan
2020-05-12 16:50 ` [PATCH v2 07/11] cmake: support for building git on windows with msvc and clang Sibi Siddharthan via GitGitGadget
2020-05-12 16:50 ` [PATCH v2 08/11] cmake: added checks for struct stat and libiconv Sibi Siddharthan via GitGitGadget
2020-05-12 21:16 ` Junio C Hamano
2020-05-13 20:05 ` Sibi Siddharthan
2020-05-14 2:00 ` Junio C Hamano
2020-05-14 15:31 ` Đoàn Trần Công Danh
2020-05-14 18:31 ` Sibi Siddharthan
2020-05-12 16:50 ` [PATCH v2 09/11] cmake: relocated script file contrib/buildsystems Sibi Siddharthan via GitGitGadget
2020-05-12 21:09 ` Junio C Hamano
2020-05-13 20:08 ` Sibi Siddharthan
2020-05-12 16:50 ` [PATCH v2 10/11] cmake: parse the makefile for the sources Sibi Siddharthan via GitGitGadget
2020-05-12 21:03 ` Junio C Hamano
2020-05-13 19:57 ` Sibi Siddharthan
2020-05-13 20:23 ` Junio C Hamano
2020-05-12 16:50 ` Sibi Siddharthan via GitGitGadget [this message]
2020-05-12 21:27 ` [PATCH v2 11/11] ci: modification of main.yml to use cmake for vs-build job Junio C Hamano
2020-05-13 19:45 ` Sibi Siddharthan
2020-05-25 19:16 ` Sibi Siddharthan
2020-05-25 20:03 ` Junio C Hamano
2020-05-25 20:56 ` Sibi Siddharthan
2020-05-25 21:40 ` Johannes Schindelin
2020-05-29 13:40 ` [PATCH v3 0/8] CMake build system for git Sibi Siddharthan via GitGitGadget
2020-05-29 13:40 ` [PATCH v3 1/8] Introduce CMake support for configuring Git Sibi Siddharthan via GitGitGadget
2020-05-29 19:27 ` Junio C Hamano
2020-05-30 18:50 ` Sibi Siddharthan
2020-05-31 16:17 ` Junio C Hamano
2020-05-30 8:00 ` Johannes Schindelin
2020-05-30 13:17 ` Đoàn Trần Công Danh
2020-05-29 13:40 ` [PATCH v3 2/8] cmake: generate the shell/perl/python scripts and templates, translations Sibi Siddharthan via GitGitGadget
2020-05-29 19:27 ` Junio C Hamano
2020-05-30 18:56 ` Sibi Siddharthan
2020-06-08 20:07 ` Sibi Siddharthan
2020-06-08 22:10 ` Junio C Hamano
2020-05-29 13:40 ` [PATCH v3 3/8] cmake: installation support for git Sibi Siddharthan via GitGitGadget
2020-05-29 13:40 ` [PATCH v3 4/8] cmake: support for testing git with ctest Sibi Siddharthan via GitGitGadget
2020-05-30 13:49 ` Đoàn Trần Công Danh
2020-05-30 19:04 ` Sibi Siddharthan
2020-05-31 1:28 ` Đoàn Trần Công Danh
2020-05-29 13:40 ` [PATCH v3 5/8] cmake: support for testing git when building out of the source tree Sibi Siddharthan via GitGitGadget
2020-05-29 13:40 ` [PATCH v3 6/8] cmake: support for building git on windows with mingw Sibi Siddharthan via GitGitGadget
2020-05-29 13:40 ` [PATCH v3 7/8] cmake: support for building git on windows with msvc and clang Sibi Siddharthan via GitGitGadget
2020-05-30 14:08 ` Đoàn Trần Công Danh
2020-05-30 19:08 ` Sibi Siddharthan
2020-05-29 13:40 ` [PATCH v3 8/8] ci: modification of main.yml to use cmake for vs-build job Sibi Siddharthan via GitGitGadget
2020-05-30 14:14 ` Đoàn Trần Công Danh
2020-05-30 19:13 ` Sibi Siddharthan
2020-06-12 18:29 ` [PATCH v4 0/8] CMake build system for git Sibi Siddharthan via GitGitGadget
2020-06-12 18:29 ` [PATCH v4 1/8] Introduce CMake support for configuring Git Sibi Siddharthan via GitGitGadget
2020-06-15 14:00 ` Øystein Walle
2020-06-15 20:04 ` Sibi Siddharthan
2020-06-12 18:29 ` [PATCH v4 2/8] cmake: generate the shell/perl/python scripts and templates, translations Sibi Siddharthan via GitGitGadget
2020-06-12 18:29 ` [PATCH v4 3/8] cmake: installation support for git Sibi Siddharthan via GitGitGadget
2020-06-12 18:29 ` [PATCH v4 4/8] cmake: support for testing git with ctest Sibi Siddharthan via GitGitGadget
2020-06-15 14:02 ` Øystein Walle
2020-06-15 19:45 ` Sibi Siddharthan
2020-06-12 18:29 ` [PATCH v4 5/8] cmake: support for testing git when building out of the source tree Sibi Siddharthan via GitGitGadget
2020-06-12 18:29 ` [PATCH v4 6/8] cmake: support for building git on windows with mingw Sibi Siddharthan via GitGitGadget
2020-06-15 14:03 ` Øystein Walle
2020-06-15 19:47 ` Sibi Siddharthan
2020-06-18 4:43 ` Junio C Hamano
2020-06-18 19:55 ` Sibi Siddharthan
2020-06-18 20:08 ` Junio C Hamano
2020-06-18 20:40 ` Sibi Siddharthan
2020-06-18 21:00 ` Junio C Hamano
2020-06-19 17:15 ` Sibi Siddharthan
2020-06-19 17:29 ` Junio C Hamano
2020-06-12 18:29 ` [PATCH v4 7/8] cmake: support for building git on windows with msvc and clang Sibi Siddharthan via GitGitGadget
2020-06-15 14:04 ` Øystein Walle
2020-06-15 19:56 ` Sibi Siddharthan
2020-06-12 18:29 ` [PATCH v4 8/8] ci: modification of main.yml to use cmake for vs-build job Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 0/8] CMake build system for git Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 1/8] Introduce CMake support for configuring Git Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 2/8] cmake: generate the shell/perl/python scripts and templates, translations Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 3/8] cmake: installation support for git Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 4/8] cmake: support for testing git with ctest Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 5/8] cmake: support for testing git when building out of the source tree Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 6/8] cmake: support for building git on windows with mingw Sibi Siddharthan via GitGitGadget
2020-06-30 7:25 ` David Aguilar
2020-07-01 17:45 ` Sibi Siddharthan
2020-07-01 17:49 ` Sibi Siddharthan
2020-06-26 16:11 ` [PATCH v5 7/8] cmake: support for building git on windows with msvc and clang Sibi Siddharthan via GitGitGadget
2020-06-26 16:11 ` [PATCH v5 8/8] ci: modification of main.yml to use cmake for vs-build job Sibi Siddharthan via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=fa1b8032906c6042a0e5851f803ec0427922a1a5.1589302255.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=sibisiddharthan.github@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).