fix(workflows): simplify conditional commands and improve cache handling

DecSmith42 · DecSmith42 · commit 6a343feca02f · 2026-01-24T15:13:41.000+10:00
Updated GitHub Actions workflows to remove unnecessary use of `format` in cache-dependent commands. Simplified command logic for `.atom` operations across all workflow files. Added conditional execution for `BuildAtom` when cache is not restored. Adjusted `IBuildTargets` to move all files to the cached directory, ensuring proper handling of all output files during the caching process.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -46,7 +46,7 @@ jobs:
       
       - name: SetupBuildInfo
         id: SetupBuildInfo
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} SetupBuildInfo --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom SetupBuildInfo --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless' }}
         env:
           pull-request-number: ${{ github.event.number }}
   
@@ -76,7 +76,8 @@ jobs:
       
       - name: BuildAtom
         id: BuildAtom
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} BuildAtom --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- BuildAtom --skip --headless' }}
+        if: steps.cache-restore-atom-build.outputs.cache-hit != true
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom BuildAtom --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- BuildAtom --skip --headless' }}
         env:
           job-runs-on: ${{ matrix.job-runs-on }}
           build-slice: ${{ matrix.job-runs-on }}
@@ -117,7 +118,7 @@ jobs:
       
       - name: PackProjects
         id: PackProjects
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} PackProjects --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- PackProjects --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom PackProjects --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- PackProjects --skip --headless' }}
       
       - name: Upload DecSm.Atom
         uses: actions/upload-artifact@v4
@@ -187,7 +188,7 @@ jobs:
       
       - name: PackTool
         id: PackTool
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} PackTool --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- PackTool --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom PackTool --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- PackTool --skip --headless' }}
         env:
           job-runs-on: ${{ matrix.job-runs-on }}
           build-slice: ${{ matrix.job-runs-on }}
@@ -233,7 +234,7 @@ jobs:
       
       - name: TestProjects
         id: TestProjects
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} TestProjects --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom TestProjects --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless' }}
         env:
           job-runs-on: ${{ matrix.job-runs-on }}
           test-framework: ${{ matrix.test-framework }}
@@ -377,7 +378,7 @@ jobs:
       
       - name: PushToNuget
         id: PushToNuget
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} PushToNuget --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- PushToNuget --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom PushToNuget --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- PushToNuget --skip --headless' }}
         env:
           build-id: ${{ needs.SetupBuildInfo.outputs.build-id }}
           azure-vault-app-secret: ${{ secrets.AZURE_VAULT_APP_SECRET }}
@@ -1138,7 +1139,7 @@ jobs:
       
       - name: PushToRelease
         id: PushToRelease
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} PushToRelease --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- PushToRelease --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom PushToRelease --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- PushToRelease --skip --headless' }}
         env:
           build-version: ${{ needs.SetupBuildInfo.outputs.build-version }}
           azure-vault-app-secret: ${{ secrets.AZURE_VAULT_APP_SECRET }}
diff --git a/.github/workflows/Dependabot Enable auto-merge.yml b/.github/workflows/Dependabot Enable auto-merge.yml
@@ -36,7 +36,7 @@ jobs:
       
       - name: ApproveDependabotPr
         id: ApproveDependabotPr
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} ApproveDependabotPr --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- ApproveDependabotPr --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom ApproveDependabotPr --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- ApproveDependabotPr --skip --headless' }}
         env:
           azure-vault-app-secret: ${{ secrets.AZURE_VAULT_APP_SECRET }}
           azure-vault-address: ${{ vars.AZURE_VAULT_ADDRESS }}
diff --git a/.github/workflows/Validate.yml b/.github/workflows/Validate.yml
@@ -41,7 +41,7 @@ jobs:
       
       - name: SetupBuildInfo
         id: SetupBuildInfo
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} SetupBuildInfo --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom SetupBuildInfo --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless' }}
         env:
           pull-request-number: ${{ github.event.number }}
   
@@ -71,7 +71,7 @@ jobs:
       
       - name: BuildAtom
         id: BuildAtom
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} BuildAtom --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- BuildAtom --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom BuildAtom --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- BuildAtom --skip --headless' }}
         env:
           job-runs-on: ${{ matrix.job-runs-on }}
           build-slice: ${{ matrix.job-runs-on }}
@@ -112,7 +112,7 @@ jobs:
       
       - name: PackProjects
         id: PackProjects
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} PackProjects --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- PackProjects --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom PackProjects --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- PackProjects --skip --headless' }}
   
   PackTool:
     strategy:
@@ -140,7 +140,7 @@ jobs:
       
       - name: PackTool
         id: PackTool
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} PackTool --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- PackTool --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom PackTool --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- PackTool --skip --headless' }}
         env:
           job-runs-on: ${{ matrix.job-runs-on }}
           build-slice: ${{ matrix.job-runs-on }}
@@ -180,7 +180,7 @@ jobs:
       
       - name: TestProjects
         id: TestProjects
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} TestProjects --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom TestProjects --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless' }}
         env:
           job-runs-on: ${{ matrix.job-runs-on }}
           test-framework: ${{ matrix.test-framework }}
@@ -251,7 +251,7 @@ jobs:
       
       - name: CheckPrForBreakingChanges
         id: CheckPrForBreakingChanges
-        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && format('.atom/{0} CheckPrForBreakingChanges --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom') || 'dotnet run --project _atom/_atom.csproj -- CheckPrForBreakingChanges --skip --headless' }}
+        run: ${{ steps.cache-restore-atom-build.outputs.cache-hit && '.atom/_atom CheckPrForBreakingChanges --skip --headless' || 'dotnet run --project _atom/_atom.csproj -- CheckPrForBreakingChanges --skip --headless' }}
         env:
           build-version: ${{ needs.SetupBuildInfo.outputs.build-version }}
           azure-vault-app-secret: ${{ secrets.AZURE_VAULT_APP_SECRET }}
diff --git a/DecSm.Atom.Module.GithubWorkflows/Generation/GithubWorkflowWriter.cs b/DecSm.Atom.Module.GithubWorkflows/Generation/GithubWorkflowWriter.cs
@@ -747,11 +747,16 @@ private void WriteCommandStep(
 
             if (runTargetStepIf.Count > 0)
             {
-                var condition = WorkflowExpressions.True.And(runTargetStepIf
-                    .Select(x => x.Condition)
-                    .ToArray());
-
-                WriteLine($"if: {condition}");
+                var condition = runTargetStepIf.Count > 1
+                    ? runTargetStepIf[0]
+                        .Condition
+                        .And(runTargetStepIf
+                            .Skip(1)
+                            .Select(x => x.Condition)
+                            .ToArray())
+                    : runTargetStepIf[0].Condition;
+
+                WriteLine($"if: {workflowExpressionGenerator.Write(condition)}");
             }
 
             var customAtomCommand = workflow
diff --git a/DecSm.Atom/Experimental/Sandbox.cs b/DecSm.Atom/Experimental/Sandbox.cs
@@ -3,13 +3,11 @@ namespace DecSm.Atom.Experimental;
 [UnstableAPI]
 public sealed record CustomAtomCommand : IWorkflowOption
 {
-    public string Write(
-        WorkflowModel workflow,
-        WorkflowStepModel workflowStep,
-        IAtomFileSystem fileSystem)
+    public string Write(WorkflowModel workflow, WorkflowStepModel workflowStep, IAtomFileSystem fileSystem)
     {
         var cacheHitCommand =
-            $"format('.atom/{{0}} {workflowStep.Name} --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom')";
+            // $"format('.atom/{{0}} {workflowStep.Name} --skip --headless', runner.os == 'windows' && '_atom.exe' || '_atom')";
+            $"'.atom/_atom {workflowStep.Name} --skip --headless'";
 
         string cacheMissCommand;
 
diff --git a/_atom/Build.cs b/_atom/Build.cs
@@ -137,6 +137,9 @@ internal partial class Build : BuildDefinition,
                         .BuildAtom
                         .WithGithubRunsOnMatrix(PlatformNames)
                         .WithOptions(new CleanAtomDirectory(),
+                            new RunTargetStepIf(WorkflowExpressions
+                                .Literal("steps.cache-restore-atom-build.outputs.cache-hit")
+                                .NotEqualTo(true)),
                             WorkflowOptions.Cache.Save(AtomBuildCacheName, AtomBuildCacheKey, AtomBuildCachePaths)),
                     WorkflowTargets.PackProjects,
                     WorkflowTargets.PackTool.WithGithubRunsOnMatrix(PlatformNames),
diff --git a/_atom/Targets/IBuildTargets.cs b/_atom/Targets/IBuildTargets.cs
@@ -87,6 +87,10 @@ await DotnetPackAndStage(FileSystem.GetPath<Projects.DecSm_Atom_Tool>(),
 
             FileSystem.Directory.CreateDirectory(cachedDirectory);
 
-            FileSystem.File.Move(atomExecutablePath, cachedDirectory / atomExecutableName);
+            foreach (var file in FileSystem.Directory.EnumerateFiles(
+                         FileSystem.AtomPublishDirectory / Projects._atom.Name,
+                         "*",
+                         SearchOption.TopDirectoryOnly))
+                FileSystem.File.Move(file, cachedDirectory / FileSystem.Path.GetFileName(file));
         });
 }
