Update: Fixed combined build bug and now releasing combined builds

Author: MrcSnm

.github/workflows/ci.yml

@@ -40,16 +40,16 @@ jobs:
       - name: Build
         if: runner.os != 'macOS'
         run: |
-          redub build -b release-debug --prefetch
+          redub build -b release-debug --prefetch --combined
       - name: Build (OSX Universal)
         if: runner.os == 'macOS'
         run: |
           # Build arm64 version
-          redub build -b release-debug --prefetch --arch=arm64-apple-darwin
+          redub build -b release-debug --prefetch --combined --arch=arm64-apple-darwin
           mv build/redub build/redub-arm64
 
           # Build x86_64 version
-          redub build -b release-debug --prefetch --arch=x86_64
+          redub build -b release-debug --prefetch --combined --arch=x86_64
           mv build/redub build/redub-x86_64
 
           lipo -create build/redub-arm64 build/redub-x86_64 -output build/redub

source/redub/buildapi.d

@@ -363,6 +363,32 @@ struct BuildConfiguration
         return ret;
     }
 
+    /**
+     * This function is mainly used to merge a dependency with its parent.
+     * Params:
+     *   other = The parent configuration
+     * Returns:
+     */
+    BuildConfiguration mergeForCombine(const ref BuildConfiguration other) const
+    {
+        BuildConfiguration ret = clone;
+        ret.extraDependencyFiles.exclusiveMergePaths(other.extraDependencyFiles);
+        ret.filesToCopy.exclusiveMergePaths(other.filesToCopy);
+        ret.stringImportPaths.exclusiveMergePaths(other.stringImportPaths);
+        ret.sourceFiles.exclusiveMerge(other.sourceFiles);
+        ret.excludeSourceFiles.exclusiveMerge(other.excludeSourceFiles);
+        ret.sourcePaths.exclusiveMergePaths(other.sourcePaths);
+        ret.importDirectories.exclusiveMergePaths(other.importDirectories);
+        ret.versions.exclusiveMerge(other.versions);
+        ret.debugVersions.exclusiveMerge(other.debugVersions);
+        ret.dFlags.exclusiveMerge(other.dFlags);
+        ret.libraries.exclusiveMerge(other.libraries);
+        ret.frameworks.exclusiveMerge(other.frameworks);
+        ret.libraryPaths.exclusiveMergePaths(other.libraryPaths);
+        ret.linkFlags.exclusiveMerge(other.linkFlags, null, linkerMergeKeep);
+        return ret;
+    }
+
     BuildConfiguration mergeCommands(const ref BuildConfiguration other) const
     {
         BuildConfiguration ret = clone;
@@ -1329,8 +1355,8 @@ class ProjectNode
      */
     void combine()
     {
+        import redub.api;
         ProjectNode[] leaves;
-
         while(true)
         {
             leaves = findLeavesNodes();
@@ -1340,10 +1366,10 @@ class ProjectNode
             {
                 foreach(ref leafParent; leaf.parent)
                 {
+                    if(leafParent.requirements.cfg.language != leaf.requirements.cfg.language)
+                        throw new RedubException("Can't combine "~leafParent.name~" with "~leaf.name~". Can only combine projects with same programming language");
                     ///Keep the old target type.
-                    TargetType oldTargetType = leafParent.requirements.cfg.targetType;
-                    leafParent.requirements.cfg = leafParent.requirements.cfg.merge(leaf.requirements.cfg);
-                    leafParent.requirements.cfg.targetType = oldTargetType;
+                    leafParent.requirements.cfg = leafParent.requirements.cfg.mergeForCombine(leaf.requirements.cfg);
                 }
                 leaf.parent[0].requirements.cfg = leaf.parent[0].requirements.cfg.mergeCommands(leaf.requirements.cfg);
                 leaf.becomeIndependent();

source/redub/extensions/update.d

@@ -13,6 +13,7 @@ int updateMain(string[] args)
     import std.file;
     import std.path;
     import redub.misc.github_tag_check;
+    import redub.misc.find_executable;
     import redub.libs.package_suppliers.utils;
     string redubExePath = thisExePath;
     string currentRedubDir = dirName(redubExePath);
@@ -47,14 +48,13 @@ int updateMain(string[] args)
     }
     setLogLevel(update.vverbose ? LogLevel.vverbose : LogLevel.info);
 
-    int gitCode = execute(["git", "--help"]).status;
     enum isNotGitRepo = 128;
-    enum hasNoGitWindows = 9009;
-    enum hasNoGitPosix = 127;
+    int gitCode = isNotGitRepo;
+    bool hasGit = findExecutable("git") != null;
 
     bool replaceRedub = false || update.noPull;
 
-    if(gitCode == 0 && !update.noPull)
+    if(hasGit && !update.noPull)
     {
         auto ret = execute(["git", "pull"], null, Config.none, size_t.max, redubPath);
         gitCode = ret.status;
@@ -70,7 +70,7 @@ int updateMain(string[] args)
         }
     }
 
-    if(gitCode == isNotGitRepo || gitCode == hasNoGitWindows || gitCode == hasNoGitPosix)
+    if(gitCode == isNotGitRepo || hasGit)
     {
         import d_downloader;
         latest = getLatestRedubVersion();
@@ -97,7 +97,7 @@ int updateMain(string[] args)
         if(update.fast)
             bt = BuildType.debug_;
 
-        ProjectDetails d = redub.api.resolveDependencies(false, os, CompilationDetails(update.compiler), ProjectToParse(update.dev ? "cli-dev" : null, redubPath), InitialDubVariables.init, bt);
+        ProjectDetails d = redub.api.resolveDependencies(false, os, CompilationDetails(compilerOrPath: update.compiler, combinedBuild:true), ProjectToParse(update.dev ? "cli-dev" : null, redubPath), InitialDubVariables.init, bt);
         enforce(d.tree.name == "redub", "Redub update should only be used to update redub.");
         d.tree.requirements.cfg.outputDirectory = buildNormalizedPath(tempDir, "redub_build");
         d = buildProject(d);