[REMOVE] Revert the fix to test CI

dlang · Feb 9, 2024 · de8f71d · de8f71d
1 parent c245b80
commit de8f71d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/source/dub/generators/build.d b/source/dub/generators/build.d
@@ -216,7 +216,7 @@ class BuildGenerator : ProjectGenerator {
 		auto cwd = settings.toolWorkingDirectory;
 		bool generate_binary = !(buildsettings.options & BuildOption.syntaxOnly);
 
-		auto build_id = buildsettings.computeBuildID(pack.path, config, settings);
+		auto build_id = buildsettings.computeBuildID(config, settings);
 
 		// make all paths relative to shrink the command line
 		string makeRelative(string path) { return shrinkPath(NativePath(path), cwd); }

diff --git a/source/dub/generators/generator.d b/source/dub/generators/generator.d
@@ -828,8 +828,7 @@ package(dub) NativePath targetCacheDir(NativePath cachePath, in Package pkg, str
  * library-debug-Z7qINYX4IxM8muBSlyNGrw
  * ```
  */
-package(dub) string computeBuildID(in BuildSettings buildsettings,
-	in NativePath packagePath, string config, GeneratorSettings settings)
+package(dub) string computeBuildID(in BuildSettings buildsettings, string config, GeneratorSettings settings)
 {
 	import std.conv : to;
 
@@ -844,8 +843,6 @@ package(dub) string computeBuildID(in BuildSettings buildsettings,
 		settings.platform.architecture,
 		[
 			(cast(uint)(buildsettings.options & ~BuildOption.color)).to!string, // exclude color option from id
-			// Needed for things such as `__FULL_FILE_PATH__`
-			packagePath.toNativeString(),
 			settings.platform.compilerBinary,
 			settings.platform.compiler,
 			settings.platform.compilerVersion,

diff --git a/source/dub/generators/targetdescription.d b/source/dub/generators/targetdescription.d
@@ -45,7 +45,7 @@ class TargetDescriptionGenerator : ProjectGenerator {
 			d.packages = ti.packages.map!(p => p.name).array;
 			d.rootConfiguration = ti.config;
 			d.buildSettings = ti.buildSettings.dup;
-			const buildId = computeBuildID(d.buildSettings, ti.pack.path, ti.config, settings);
+			const buildId = computeBuildID(d.buildSettings, ti.config, settings);
 			const filename = settings.compiler.getTargetFileName(d.buildSettings, settings.platform);
 			d.cacheArtifactPath = (targetCacheDir(settings.cache, ti.pack, buildId) ~ filename).toNativeString();
 			d.dependencies = ti.dependencies.dup;