Cache NuGet on .csproj files (#372)

* Cache NuGet on .csproj files * Fix restore keys * Formatting Markdown * Fix * Update PipelineWriterTests.cs --------- Co-authored-by: Tom Longhurst <thomhurst@users.noreply.github.com>
thomhurst · Jan 12, 2024 · ef2c11d · ef2c11d
1 parent b16cc9d
commit ef2c11d
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/dotnet-mac.yml b/.github/workflows/dotnet-mac.yml
@@ -31,9 +31,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
           restore-keys: |
-            ${{ runner.os }}-nuget-
+            ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
       - name: Build ModularPipelines.Analyzers.sln
         run: dotnet build ModularPipelines.Analyzers.sln -c Release
       - name: Build

diff --git a/.github/workflows/dotnet-windows.yml b/.github/workflows/dotnet-windows.yml
@@ -33,9 +33,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
           restore-keys: |
-            ${{ runner.os }}-nuget-
+            ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
       - name: Build ModularPipelines.Analyzers.sln
         run: dotnet build ModularPipelines.Analyzers.sln -c Release
       - name: Build

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -49,9 +49,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: ~/.nuget/packages
-          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
           restore-keys: |
-            ${{ runner.os }}-nuget-
+            ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
       - name: Build ModularPipelines.Analyzers.sln
         run: dotnet build ModularPipelines.Analyzers.sln -c Release
       - name: Build

diff --git a/src/ModularPipelines.Build/ReleaseNotes.md b/src/ModularPipelines.Build/ReleaseNotes.md
@@ -1 +1 @@
-NULL
+null
diff --git a/src/ModularPipelines.GitHub/PipelineWriters/GitHubPipelineFileWriter.cs b/src/ModularPipelines.GitHub/PipelineWriters/GitHubPipelineFileWriter.cs
@@ -54,8 +54,8 @@ public async Task Write(IPipelineHookContext pipelineHookContext)
                             With = new
                             {
                                 path= "~/.nuget/packages",
-                                key= "${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}",
-                                RestoreKeys = "${{ runner.os }}-nuget-",
+                                key= "${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}",
+                                RestoreKeys = "${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}",
                             },
                         },
                         new

diff --git a/src/ModularPipelines/Engine/PipelineFileWriter.cs b/src/ModularPipelines/Engine/PipelineFileWriter.cs
@@ -18,11 +18,11 @@ IEnumerable<IBuildSystemPipelineFileWriter> writers
         _serviceProvider = serviceProvider;
         _writers = writers;
     }
-    
+
     public async Task WritePipelineFiles()
     {
         await _writers
-            .ForEachAsync(x => 
+            .ForEachAsync(x =>
                 x.Write(_serviceProvider.GetRequiredService<IPipelineContext>())
             )
             .ProcessInParallel();

diff --git a/test/ModularPipelines.UnitTests/PipelineWriterTests.cs b/test/ModularPipelines.UnitTests/PipelineWriterTests.cs
@@ -132,8 +132,8 @@ await TestPipelineHostBuilder.Create()
                              uses: actions/cache@v3
                              with:
                                path: ~/.nuget/packages
-                               key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-                               restore-keys: ${{ runner.os }}-nuget-
+                               key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
+                               restore-keys: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj') }}
                            - name: Run Pipeline
                              run: dotnet run -c Release --framework net7.0 {{{RandomFilePath}}}
                              env:
@@ -154,4 +154,4 @@ await TestPipelineHostBuilder.Create()
                                EMAIL_PASSWORD: ${{ secrets.EMAIL_PASSWORD }}
                        """.Trim()));
     }
-}
+}