immutability...

RocketSurgeonsGuild · Feb 3, 2024 · 49ed71b · 49ed71b
1 parent 86bb30c
commit 49ed71b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -139,7 +139,7 @@ jobs:
         id: pack
         run: |
           dotnet nuke Pack --skip --thisisaothervariable '${{ vars.THIS_IS_A_VARIABLE }}' --thisisanothervariable '${{ vars.THIS_IS_ANOTHER_VARIABLE }}' --this_is_a_variable '${{ vars.THIS_IS_A_VARIABLE }}' --thisisaenv '${{ env.THIS_IS_A_ENV || 'test' }}' --thisisasecret '${{ secrets.THIS_IS_A_SECRET }}' --githubtoken '${{ secrets.GITHUB_TOKEN }}'
-      - name: 🏺 coverage (${{ matrix.os }})
+      - name: 🏺 Publish coverage data (${{ matrix.os }})
         if: matrix.os != 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
@@ -149,14 +149,14 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: '${{ matrix.os }}-coverage'
+          name: 'coverage'
           path: 'coverage/'
       - name: 🐿 Publish Coverage
         if: (github.event_name != 'pull_request' && github.event_name != 'pull_request_target') || ((github.event_name == 'pull_request' || github.event_name == 'pull_request_target') && github.event.pull_request.user.login != 'renovate[bot]' && github.event.pull_request.user.login != 'dependabot[bot]')
         uses: codecov/codecov-action@v4
         with:
           name: 'actions-${{ matrix.os }}'
-      - name: 🏺 logs (${{ matrix.os }})
+      - name: 🏺 Publish logs (${{ matrix.os }})
         if: matrix.os != 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
@@ -166,9 +166,9 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: '${{ matrix.os }}-logs'
+          name: 'logs'
           path: 'artifacts/logs/'
-      - name: 🏺 test data (${{ matrix.os }})
+      - name: 🏺 Publish test data (${{ matrix.os }})
         if: matrix.os != 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
@@ -178,9 +178,9 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: '${{ matrix.os }}-test data'
+          name: 'test data'
           path: 'artifacts/test/'
-      - name: 🏺 nuget (${{ matrix.os }})
+      - name: 🏺 Publish NuGet Packages (${{ matrix.os }})
         if: matrix.os != 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
@@ -190,7 +190,7 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: '${{ matrix.os }}-nuget'
+          name: 'nuget'
           path: 'artifacts/nuget/'
   Publish:
     needs:

diff --git a/src/Nuke/GithubActions/GitHubActionsStepsAttribute.cs b/src/Nuke/GithubActions/GitHubActionsStepsAttribute.cs
@@ -410,14 +410,14 @@ public override ConfigurationEntity GetConfiguration(IReadOnlyCollection<Executa
             {
                 steps.Insert(
                     steps.IndexOf(step),
-                    new UploadArtifactStep($$$"""{{{step.Name}}} (${{ matrix.os }})""")
+                    new UploadArtifactStep($$$"""{{{step.StepName}}} (${{ matrix.os }})""")
                     {
                         If = $"matrix.os != '{mainOs}'",
                         Name = $$$"""${{ matrix.os }}-{{{step.Name}}}""",
                         Path = step.Path,
-                        Environment = step.Environment,
-                        Outputs = step.Outputs,
-                        With = step.With,
+                        Environment = step.Environment.ToDictionary(z => z.Key, z => z.Value),
+                        Outputs = step.Outputs.ToList(),
+                        With = step.With.ToDictionary(z => z.Key, z => z.Value),
                         Uses = step.Uses,
                         Overwrite = step.Overwrite,
                         CompressionLevel = step.CompressionLevel,