From ff528f1fa6e55e1e7f47500143a7bcec2ec61018 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Wed, 7 Apr 2021 11:12:50 -0400
Subject: [PATCH] CI: Fix debug info for Linux & Windows

---
 .github/workflows/release.yml | 4 ++++
 ci/build-appimage.sh          | 3 +--
 ci/split-debug-linux.sh       | 6 ++++++
 ci/upload-debug-linux.sh      | 5 -----
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100755 ci/split-debug-linux.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 78c879e29..81ce256a0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -65,6 +65,9 @@ jobs:
         working-directory: ${{github.workspace}}/build
         run: cmake --build .
 
+      - name: Split debug information
+        run: ci/split-debug-linux.sh
+
       - name: Upload debug information
         if: ${{matrix.name == 'Clang'}}
         env:
@@ -214,6 +217,7 @@ jobs:
         run: cmake --build .
 
       - name: Upload debug information
+        working-directory: ${{github.workspace}}/build/Binaries
         env:
           SENTRY_AUTH_TOKEN: ${{secrets.SENTRY_AUTH_TOKEN}}
           SENTRY_URL: ${{secrets.SENTRY_URL}}
diff --git a/ci/build-appimage.sh b/ci/build-appimage.sh
index 8d785d8e5..8614dde33 100755
--- a/ci/build-appimage.sh
+++ b/ci/build-appimage.sh
@@ -8,7 +8,6 @@ chmod +x linuxdeploy-$(uname -m).AppImage linuxdeploy-plugin-qt-$(uname -m).AppI
 # Build AppImage
 mkdir -p appdir/usr/{bin,share/{applications,icons/hicolor}}
 cp build/Binaries/{hecl,metaforce-gui,metaforce,visigen} appdir/usr/bin
-strip -S appdir/usr/bin/{hecl,metaforce-gui,metaforce,visigen}
 cp -r metaforce-gui/platforms/freedesktop/{16x16,32x32,48x48,64x64,128x128,256x256,512x512,1024x1024} appdir/usr/share/icons/hicolor
 cp metaforce-gui/platforms/freedesktop/metaforce.desktop appdir/usr/share/applications
-VERSION="$METAFORCE_VERSION" ./linuxdeploy-$(uname -m).AppImage --appdir appdir --plugin qt --output appimage
+VERSION="$METAFORCE_VERSION" NO_STRIP=1 ./linuxdeploy-$(uname -m).AppImage --appdir appdir --plugin qt --output appimage
diff --git a/ci/split-debug-linux.sh b/ci/split-debug-linux.sh
new file mode 100755
index 000000000..1511f2617
--- /dev/null
+++ b/ci/split-debug-linux.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+cd build/Binaries
+for f in hecl metaforce-gui metaforce visigen; do
+  objcopy --only-keep-debug --compress-debug-sections=zlib $f $f.dbg
+  objcopy --strip-debug --add-gnu-debuglink=$f.dbg $f
+done
\ No newline at end of file
diff --git a/ci/upload-debug-linux.sh b/ci/upload-debug-linux.sh
index 7f97734d8..2fbf9b9eb 100755
--- a/ci/upload-debug-linux.sh
+++ b/ci/upload-debug-linux.sh
@@ -1,7 +1,2 @@
 #!/bin/bash -ex
-cd build/Binaries
-for f in hecl metaforce-gui metaforce visigen; do
-  objcopy --only-keep-debug --compress-debug-sections=zlib $f $f.dbg
-done
-strip -S hecl metaforce-gui metaforce visigen
 sentry-cli upload-dif --org axiodl --project metaforce {hecl,metaforce-gui,metaforce,visigen}{,.dbg} --include-sources