Re: [PATCH v4 00/12] ci: replace our Azure Pipeline by GitHub Actions
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 16, 2020, 00:49 UTC
- Message-ID
- <xmqqh7xk45l4.fsf@gitster.c.googlers.com>
- In-Reply-To
- <20200410174141.GB27699@danh.dev>
Danh Doan <congdanhqx@gmail.com> writes:
Show 20 quoted lines
> On 2020-04-10 08:42:10-0700, Junio C Hamano <gitster@pobox.com> wrote: >> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes: >> ... >> > I would like to point out that there is only one single topic that is >> > cause for sorrow here, and it is the reftable one. >> >> I first thought so, too, but vsbuild failures like the one in >> https://github.com/git/git/runs/575116793 do not appear to be >> caused by that topic (6a8c1d17b8 excludes reftable), so there >> must be somebody else that is broken. > > Excerpt from build log: > >> fatal error C1083: Cannot open include file: 'config-list.h' > > It's from bugreport topic. > I've seen this failure in the past (when testing with pu), > then I saw it disappear. > > I thought it was fixed during my testing for v4.
Is the issue something similar to 976aaedc (msvc: add a Makefile target to pre-generate the Visual Studio solution, 2019-07-29)?
If that is the case, perhaps something like this would help? I'll tentatively queue it on top of es/bugreport and merge the result to 'pu' to see what happens.
-- >8 -- Subject: msvc: the bugreport topic depends on a generated config-list.h file
For reasons explained in 976aaedc (msvc: add a Makefile target to pre-generate the Visual Studio solution, 2019-07-29), some build artifacts we consider non-source files cannot be generated in the Visual Studio environment, and we already have some Makefile tweaks to help Visual Studio to use generated command-list.h header file.
As this topic starts to depend on another such generated header file, config-list.h, let's do the same to it.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- compat/vcbuild/README | 4 ++-- config.mak.uname | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/compat/vcbuild/README b/compat/vcbuild/README index 1b6dabf5a2..42292e7c09 100644 --- a/compat/vcbuild/README +++ b/compat/vcbuild/README @@ -92,8 +92,8 @@ The Steps of Build Git with VS2008 the git operations. 3. Inside Git's directory run the command: - make command-list.h - to generate the command-list.h file needed to compile git. + make command-list.h config-list.h + to generate the header file needed to compile git. 4. Then either build Git with the GNU Make Makefile in the Git projects root diff --git a/config.mak.uname b/config.mak.uname index 0ab8e00938..f880cc2792 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -721,9 +721,9 @@ vcxproj: echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets - # Add command-list.h - $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h - git add -f command-list.h + # Add command-list.h and config-list.h + $(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 config-list.h command-list.h + git add -f config-list.h command-list.h # Add scripts rm -f perl/perl.mak