From aba2348e018a88ff296c57da82c4fce90b95da57 Mon Sep 17 00:00:00 2001
From: Brett Hazen <2651260+bhazen@users.noreply.github.com>
Date: Thu, 6 Mar 2025 14:26:43 -0600
Subject: [PATCH] Account for restructure of solution files in workflows

---
 .github/workflow-gen/Program.cs               | 6 +++---
 .github/workflows/identity-server-ci.yml      | 4 ++--
 .github/workflows/identity-server-release.yml | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflow-gen/Program.cs b/.github/workflow-gen/Program.cs
index 2a6dee625..e23543f87 100644
--- a/.github/workflow-gen/Program.cs
+++ b/.github/workflow-gen/Program.cs
@@ -39,7 +39,7 @@ void GenerateIdentityServerWorkflow(Product product)
         .RunEitherOnBranchOrAsPR()
         .Name("Build")
         .RunsOn(GitHubHostedRunners.UbuntuLatest)
-        .Defaults().Run("bash", ".")
+        .Defaults().Run("bash", product.Name)
         .Job;
 
     job.Permissions(
@@ -87,7 +87,7 @@ void GenerateIdentityServerReleaseWorkflow(Product product)
         .Name("Tag and Pack")
         .RunsOn(GitHubHostedRunners.UbuntuLatest)
         .Permissions(contents: Permission.Write, packages: Permission.Write)
-        .Defaults().Run("bash", ".").Job;
+        .Defaults().Run("bash", product.Name).Job;
 
     job.Step()
         .ActionsCheckout();
@@ -440,7 +440,7 @@ public static class StepExtensions
 
     public static void StepUploadArtifacts(this Job job, string componentName, bool uploadAlways = false)
     {
-        var path = $"artifacts/*.nupkg";
+        var path = $"{componentName}/artifacts/*.nupkg";
         var step = job.Step()
             .Name("Upload Artifacts");
 
diff --git a/.github/workflows/identity-server-ci.yml b/.github/workflows/identity-server-ci.yml
index 10752cb51..a634138d5 100644
--- a/.github/workflows/identity-server-ci.yml
+++ b/.github/workflows/identity-server-ci.yml
@@ -29,7 +29,7 @@ jobs:
     defaults:
       run:
         shell: bash
-        working-directory: .
+        working-directory: identity-server
     timeout-minutes: 15
     steps:
     - name: Checkout
@@ -77,6 +77,6 @@ jobs:
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
         name: artifacts
-        path: artifacts/*.nupkg
+        path: identity-server/artifacts/*.nupkg
         overwrite: true
         retention-days: 15
diff --git a/.github/workflows/identity-server-release.yml b/.github/workflows/identity-server-release.yml
index ed78016a0..9537692ca 100644
--- a/.github/workflows/identity-server-release.yml
+++ b/.github/workflows/identity-server-release.yml
@@ -32,7 +32,7 @@ jobs:
     defaults:
       run:
         shell: bash
-        working-directory: .
+        working-directory: identity-server
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -83,7 +83,7 @@ jobs:
       uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882
       with:
         name: artifacts
-        path: artifacts/*.nupkg
+        path: identity-server/artifacts/*.nupkg
         overwrite: true
         retention-days: 15
   publish: