fix(workflows): include runner architecture in cache key calculation

DecSmith42 · DecSmith42 · commit 48abb06a9043 · 2026-01-24T15:00:43.000+10:00
Updated GitHub Actions workflows and `Build.cs` to incorporate runner architecture (`runner.arch`) in the cache key calculation for `.atom` build artifacts. Improves cache precision and supports cross-platform and multi-architecture builds.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -42,7 +42,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: SetupBuildInfo
         id: SetupBuildInfo
@@ -72,7 +72,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: BuildAtom
         id: BuildAtom
@@ -92,7 +92,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
   
   PackProjects:
     runs-on: ubuntu-latest
@@ -113,7 +113,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: PackProjects
         id: PackProjects
@@ -183,7 +183,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: PackTool
         id: PackTool
@@ -229,7 +229,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: TestProjects
         id: TestProjects
@@ -373,7 +373,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: PushToNuget
         id: PushToNuget
@@ -1134,7 +1134,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: PushToRelease
         id: PushToRelease
diff --git a/.github/workflows/Dependabot Enable auto-merge.yml b/.github/workflows/Dependabot Enable auto-merge.yml
@@ -32,7 +32,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: ApproveDependabotPr
         id: ApproveDependabotPr
diff --git a/.github/workflows/Validate.yml b/.github/workflows/Validate.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: SetupBuildInfo
         id: SetupBuildInfo
@@ -67,7 +67,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: BuildAtom
         id: BuildAtom
@@ -87,7 +87,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
   
   PackProjects:
     runs-on: ubuntu-latest
@@ -108,7 +108,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: PackProjects
         id: PackProjects
@@ -136,7 +136,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: PackTool
         id: PackTool
@@ -176,7 +176,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: TestProjects
         id: TestProjects
@@ -247,7 +247,7 @@ jobs:
         with:
           path: |
             ${{ github.workspace }}/.atom
-          key: ${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
+          key: ${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}
       
       - name: CheckPrForBreakingChanges
         id: CheckPrForBreakingChanges
diff --git a/_atom/Build.cs b/_atom/Build.cs
@@ -43,6 +43,13 @@ internal partial class Build : BuildDefinition,
         Values = FrameworkNames,
     };
 
+    private const string AtomBuildCacheName = "atom-build";
+
+    private const string AtomBuildCacheKey =
+        "${{ format('{0}-{1}-atom-build-{2}', runner.os, runner.arch, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}";
+
+    private static readonly WorkflowExpression[] AtomBuildCachePaths = ["${{ github.workspace }}/.atom"];
+
     public override IReadOnlyList<IWorkflowOption> GlobalWorkflowOptions =>
         field ??=
         [
@@ -54,9 +61,7 @@ internal partial class Build : BuildDefinition,
                 Value = true,
             },
             new CustomAtomCommand(),
-            WorkflowOptions.Cache.Restore("atom-build",
-                "${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}",
-                ["${{ github.workspace }}/.atom"]),
+            WorkflowOptions.Cache.Restore(AtomBuildCacheName, AtomBuildCacheKey, AtomBuildCachePaths),
         ];
 
     public override IReadOnlyList<WorkflowDefinition> Workflows =>
@@ -82,9 +87,7 @@ internal partial class Build : BuildDefinition,
                         .BuildAtom
                         .WithGithubRunsOnMatrix(PlatformNames)
                         .WithOptions(new CleanAtomDirectory(),
-                            WorkflowOptions.Cache.Save("atom-build",
-                                "${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}",
-                                ["${{ github.workspace }}/.atom"])),
+                            WorkflowOptions.Cache.Save(AtomBuildCacheName, AtomBuildCacheKey, AtomBuildCachePaths)),
                     WorkflowTargets.PackProjects.WithSuppressedArtifactPublishing,
                     WorkflowTargets.PackTool.WithSuppressedArtifactPublishing.WithGithubRunsOnMatrix(PlatformNames),
                     WorkflowTargets
@@ -134,9 +137,7 @@ internal partial class Build : BuildDefinition,
                         .BuildAtom
                         .WithGithubRunsOnMatrix(PlatformNames)
                         .WithOptions(new CleanAtomDirectory(),
-                            WorkflowOptions.Cache.Save("atom-build",
-                                "${{ format('{0}-atom-build-{1}', runner.os, hashFiles('_atom/**/*.cs', '_atom/appsettings.json', '_atom/packages.lock.json')) }}",
-                                ["${{ github.workspace }}/.atom"])),
+                            WorkflowOptions.Cache.Save(AtomBuildCacheName, AtomBuildCacheKey, AtomBuildCachePaths)),
                     WorkflowTargets.PackProjects,
                     WorkflowTargets.PackTool.WithGithubRunsOnMatrix(PlatformNames),
                     WorkflowTargets
