mirrors/dmd
1
0
Fork 0
mirror of https://github.com/dlang/dmd.git synced 2025-04-25 20:50:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

[stable] build.d: Fix VERSION fallback if git describe fails (#21133)

Browse source 
* build.d: Fix VERSION fallback if `git describe` fails

Which can fail for *shallow* git clones, as used for GitHub Actions.

* [apply to config.d as well; e.g., used by Visual Studio project]
This commit is contained in:
Martin Kinkelin 2025-04-01 22:10:37 +02:00 • committed by GitHub
parent c6863be720
commit dbe0ddbde6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/src/build.d
View file

@ -411,7 +411,7 @@ alias versionFile = makeRule!((builder, rule) {
return gitResult.output.strip;
}
// version fallback
return dmdRepo.buildPath("VERSION").readText;
return dmdRepo.buildPath("VERSION").readText.strip;
});
builder
.target(env["G"].buildPath("VERSION"))

2
config.d
View file

@ -55,7 +55,7 @@ string generateVersion(const string versionFile)
enum workDir = __FILE_FULL_PATH__.dirName;
const result = execute(["git", "-C", workDir, "describe", "--dirty"]);
return result.status == 0 ? result.output.strip : versionFile.readText;
return result.status == 0 ? result.output.strip : versionFile.readText.strip;
}
/**