From c80a8e3f669f41b13fdb66d58bd6e2cad6bc1222 Mon Sep 17 00:00:00 2001
From: Kyle Bouchard <kbouchard@devolutions.net>
Date: Mon, 12 Aug 2024 08:15:57 -0400
Subject: [PATCH] feat(pedm): add symbols in package

---
 .github/workflows/ci.yml      | 11 -----------
 .github/workflows/package.yml | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7c23e152d..41262b28d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -603,10 +603,6 @@ jobs:
           
           ./ci/tlk.ps1 build -Product agent -Platform ${{ matrix.os }} -Architecture ${{ matrix.arch }} -CargoProfile ${{ needs.preflight.outputs.rust-profile }}
 
-          Get-ChildItem -Path "${{ steps.load-variables.outputs.staging-path }}" -Recurse -Include '*.pdb' | % {
-            Move-Item $_ "${{ steps.load-variables.outputs.symbols-path }}"
-          }
-
       - name: Package
         shell: pwsh
         if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
@@ -628,13 +624,6 @@ jobs:
         with:
           name: devolutions-agent-${{ matrix.os }}-${{ matrix.arch }}
           path: ${{ steps.load-variables.outputs.staging-path }}
-      
-      - name: Upload artifact symbols
-        if: matrix.os == 'windows'
-        uses: actions/upload-artifact@v4
-        with:
-          name: devolutions-agent-${{ matrix.os }}-${{ matrix.arch }}-symbols
-          path: ${{ steps.load-variables.outputs.symbols-path }}
 
   devolutions-agent-merge:
     name: devolutions agent merge artifacts
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
index 7fe8ca72e..6e63bea33 100644
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -462,6 +462,14 @@ jobs:
         with:
           pattern: devolutions-agent-*
           merge-multiple: true
+      
+      - name: Split symbols
+        shell: pwsh
+        run: |
+          $SymbolsPath = New-Item -ItemType Directory $(Join-Path "${{ runner.temp }}" 'symbols')
+          Get-ChildItem -Path "${{ github.workspace }}" -Recurse -Include '*.pdb' | % {
+            Move-Item $_ $SymbolsPath
+          }
 
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4
@@ -469,6 +477,13 @@ jobs:
           path: ${{ github.workspace }}/**/*
           name: devolutions-agent
           overwrite: true
+  
+      - name: Upload Symbol Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          path: ${{ runner.temp }}/symbols
+          name: devolutions-agent
+          overwrite: true
 
   jetsocat-merge:
     name: Merge jetsocat artifacts