ci: avoid d/f conflict in vs/master #2618
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It already caused problems with the test suite that the directory containing `git.vcxproj` is called the same as the Git executable without its file extension: `./git` is ambiguous, it could refer both to the directory `git/` as well as to `git.exe`. Now there is one more problem: when our GitHub workflow runs on the `vs/master` branch, it fails in all but the Windows builds, as they want to write the file `git` but there is already a directory in the way. Let's just go ahead and append `.proj` to all of those directories, e.g. `git.proj/` instead of `git/`. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
avoid-d/f-conflict-in-vs/master
branch
from
f22aed1
to
8b2d27b
Compare
PhilipOakley
reviewed
May 9, 2020
PhilipOakley
reviewed
May 9, 2020
|
I think I recognise that run 😉. Thank you for working on this so quickly. I think the |
When we commit the template directory as part of `make vcxproj`, the `branches/` directory is not actually commited, as it is empty. Two tests were not prepared for that situation. This developer tried to get rid of the support for `.git/branches/` a long time ago, but that effort did not bear fruit, so the best we can do is work around in these here tests. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
The convention in Git project's shell scripts is to have white-space _before_, but not _after_ the `>` (or `<`). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
dscho
force-pushed
the
avoid-d/f-conflict-in-vs/master
branch
from
d2cc0c6
to
60fe2fd
Compare
It actually stems from cogito... a long-defunct front-end to Git, back from the days when Linus still thought that Git would be almost exclusively plumbing, and everybody would write their own wrappers around it. Maybe at some stage I will have learned enough diplomacy to get something like https://lore.kernel.org/git/cover.1494509599.git.johannes.schindelin@gmx.de/ off the ground. For now, I just have to live with |
|
BTW if you're interested to know why the |
|
@PhilipOakley would you care to re-review the latest two commits? |
PhilipOakley
reviewed
May 9, 2020
There was a problem hiding this comment.
5a818a2 LGTM. (Not sure if the "approve" button would do too many things...)
It wouldn't do too many things, it would instead record your LGTM in a more formal manner ;-) |
|
I'll just go ahead and merge it ;-) |
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 9, 2020
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 9, 2020
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 9, 2020
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 10, 2020
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 10, 2020
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
May 11, 2020
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 25, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 26, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Sep 26, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Sep 26, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Sep 26, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Sep 26, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Sep 26, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Sep 27, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
to dscho/git
that referenced
this pull request
Oct 3, 2024
…-in-vs/master ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 4, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 4, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 4, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
to dscho/git
that referenced
this pull request
Oct 8, 2024
…-in-vs/master ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 8, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 8, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 8, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 8, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 9, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 9, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 9, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 9, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 9, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 9, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 10, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 10, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 10, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 11, 2024
ci: avoid d/f conflict in vs/master
git-for-windows-ci
pushed a commit
that referenced
this pull request
Oct 11, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 11, 2024
ci: avoid d/f conflict in vs/master
dscho
added a commit
that referenced
this pull request
Oct 11, 2024
ci: avoid d/f conflict in vs/master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As can be seen in this run, our current GitHub workflow does not play well with our
vs/masterbranch: we commit.vcxprojfiles in directories named identically to the executables' names. This works on Windows because the executables actually have an additional.exefilename suffix. But on Linux/macOS, the compilation fails because they cannot write, say,git: there is already a directory under that name.Let's fix this by renaming those directories, appending the suffix
.proj. Oh, and work around.git/branches/problems (why exactly do we still create this directory?).